Added domain/subdomain to extension with unit test