Cleaned up Retriever tests
Updated tests