Fix Broken Tests LPS-49633