LPS-30341 Revert broken tests