PLA-833 ja unit test added, changes in matcher due to that