Test cleanup

Fix some minor annoyances when running the test suite.