[BACKLOG-290] Fixed unit tests