CB-5238 fixing typo and updating tests