LPS-49255 Update tests to reflect the new behaviour