The Tom Fink Cavitation Tunnel and waterjet test loop are described. New and developing techniques for improved investigation of viscous and cavitation phenomena in waterjet flows are discussed. Consideration is given to testing at high Reynolds numbers, hull boundary layer simulation and water quality as related to cavitation testing. A range of instrumentation and possible measurements, for investigation of waterjet inlet flows, are presented.