fixing tests, EDUID-179