CON-553: Fixed unit test