LPS-45935 Fix (some) tests

Rebased