LPS-38619

@giros, can you please help me finish the tests? thanks! :)