LPS-35256 Fix Tests