WyC: more updates to test cases to eliminate variables which are not declared.