Raman - Refactor webservice test as per current changes