Further cleanup of testing code. There shouldn't be any output during testing.