LPS-39242 Fix Staging broken tests