Added unit tests for web service datahandler