Removed unnecessary unused's, fixed parsing for test 1
Working tests, except the new return test.
Working parser unit tests for return.