Added a few more test cases for BottomTileIndexer.

Test coverage is now effectively 100% for this class.
Fixed merge conflicts.