Fix intermittent import spec failure, and tidy up site/host factory usage