Fixed webserver
Disabled failing unit test