refactored webservice tests