[P] - tweaks and fixes, mocks and modified soapUI project