Raman - Refactor webservice test