[BACKLOG-179] Fixing/Updating unit tests