LPS-46804 Test both scenarios