Adds tests and support for h.source()/h.resolve()