fixing indexvalues and test