Fix up so the test routine throws ExitFailure when appropriate
Fix up so the test routine throws ExitFailure when appropriate

eigengrau/hlint,ndmitchell/hlint,bitemyapp/hlint,ndmitchell/hlint,gibiansky/hlint,mpickering/hlint