WyC: updated still more test cases so that variables are always correctly declared.