simplifying completion timeout and test server