Revert "Revert "CNAME removal test""

This reverts commit c7ed3d8c19f896ad6f1e18a7672473f1187b9e57.