Extended the mock system
Fixed some pmd warnings
Merge branch 'master' of https://github.com/otudor/WSTester.git