Move host into resource (standalone tests now all work)