PLA-554 adding additional tests, changes in code due to those