Revision to MultiCellBuffer - All tests pass