LPS-30341 Revert tests