PLA-1016 cleanup, tests refactoring due to changes