Adding optional domain testing w default fallback