Added tests for indexing