Added Source to Hosts, updated tests and views