Minor changes to test suite.