PLA-1641 Added unit tests