Server modifications for testing it