CON-549: Fixed unit tests after code changes