Evaluating define statements

Evaluating define statements tests pass

All tests in the first 4 test files pass