More table indexer work.
more unit tests