CLUB-42 start fixing tests