WyC: still more update to test cases which are failing because they have undeclared variables.