Fix the itests.