issue #12. Adjustments for JUnit tests in order to match web service
requirements.