added web service testing and some clean up