Fixed some bugs in the tests.