LPS-40792 Pushed to upstream - Fix tests