simplify the union of cls and bases test suites.