Some cleanup around the test fixtures.
Fix exception output.