Make tests pass
[MERGE][TICKET 619375] fix tests