Fix test server to run easily via direct call