[CB-4036] - fixed up some failing tests