fixing broken tests due to type index