Resurrect server-specific tests