Re-jig for server test.