Fixing tests and simplifying map reduce code in find('list')