Solve compilation problems in itests after CircuitPath rename.