Change utest to work with new retriever