Fix tests
Fix test server