remove the index level class support
fix the test that relies on it, just index the data for each test case