Fixed bugs in test suite.