Changed lambda definition to only count arguments
Using sub-tree matching for parser tests