Fix tests and hostname forces