fixes tests
gets rid of extra indexing