Fixes

Fixes the tests and checks for running web server better.