Fixed a bug in ast matching, added tests that do a round-trip to grader