LPS-48169 Fix tests?