fixing tests, EDUID-181
tests pass, EDUID-181