Completing initial indexer class, and adding test cases