CellRetriever and unit tests