Move '@util.retriever' tests, fix global ref bug, test injection