Fixed problems in tests.