#1: Fixed bugs in tests.