Fixed some errors is test suite.