LPS-42184 Fix tests
LPS-42150