TileBuffer and unit-test re-write