Fix subdomain, add test, space and comment fix