tweaks to test suite.