Make test server more robust