Make suites versioned (part 2)