update to use extendable webserver, fix tests etc