Merge "Renumber tests 988-Too{Wide,Deep}ClassInstanceOf"