Fix a couple of FPEs in tests.

Cleanup some test output.