Additional fixes in test suite.