Luke: better fix for indices and int tests
Luke: better fix for indices and int tests

mkl-/scioncc,crchemist/scioncc,scionrep/scioncc,crchemist/scioncc,mkl-/scioncc,ooici/pyon,scionrep/scioncc,crchemist/scioncc,ooici/pyon,mkl-/scioncc,scionrep/scioncc