LPS-43427

LPS-43427 tests fixed