PLA-451 adding unit test, and according changes