modifications for testing server