WyC: more changes to test cases to ensure all variables are declared.