WyC: more updates to test cases for ensure variables are declared.