Fixed regression bugs in test suite.