Added new tests, more parser fixes!