fix index-dependent tests
Merge pull request #529 from smolcoder/index_dependent_test_fix

fix index-dependent tests