Working on test cases still
WyC: more updates to test cases to ensure that variables are always declared.