fixed wrong handling in webservice; Adjustet tests