Finish refactoring of partitioner so that tests pass