Fixed 2 bugs in the test suite.