Improve test server setup
Update tests