Fix itest suites