[BACKLOG-290] Fixing unit tests in master