LPS-48328 Fix Tests