LPS-34657 Fix some tests (not all)