CON-751: Fixed unit tests