LPS-48834 Fix broken tests