decouple name correction from study import tests
fix indexing issue
fix indexing issue