Improve tests using threaded Server