Add SERVER_NAME
Test new cases
Include it in coverage.