threaded server, fixed bug in acceptance tests
removed old imports from Server