Fix tests before MR
Fix wildcard for domains (before MR)