added tests to fill in, indexer mostly tested