added missing files to repo, removed mockery dependency in core tests,
corrected _.clone approach for testing retriever, renamed some internal
files, removed mockery test, resolved interference between tests