LPS-49619 Fix Tests