Fix subdomain, add test, space and comment fix
Fix subdomain, add test, space and comment fix