WyC: continuing to rework test cases to ensure all variables are correctly declared.
WyC: continuing to update the test cases; had enough for now!!!