Fixed problems in tests