Removed some unused test code
Templating of indexing