LPS-34733 Fix tests