fixed issues in tests