Fixed bugs in test-classes