CON-756 | Fixed unit tests