LPS-42068 adapt tests to new expected behavior and adds more tests