Fixed language. Removed a test that will be done in SoapUI
Fixed failing tests
Merge branch 'master' into u/ixa1