fixed problems in tests