pipesnpumps, a quick correction: Diesel pumps don't use a casing relief valve. Discharge water is either siphoned off and run through a heat exchanger, and then used to cool the driver, or a radiator is installed. Don't have my copy of 20 handy, but I think the reference is at the end of 5.11 in the 2007 edition. That being said, a main relief valve is still required downstream of the pump to prevent overpressurization.
Oremus: I've never done a pump installation utilizing a flow meter instead of a test header, but if overheating is a concern, could the test loop be piped through the same heat exchanger as the cooling line?