Fixed unit test suite.