Add cell recycling. Using mock for test. This is pretty implementation specific (which is fragile), but haven't found a better way (yet) to test this as an efficient/effective unit test.