revert b5f993d, see EDUID-179
fixing tests, see EDUID-179