Webserver2

This was to fix the unit tests for the webserver. The unit tests now all pass