LPS-44999 Revert new tests - will be re-added later today
LPS-43298 Fix test