Moving index to test-generic