--HACK-- Remove CNAME for tests