Bug: only MATCH_XXXX_PAREN are exclusive.
Changed test to match the new interface.
Bug: check if mapping is not null before querying it.
Updates test to match the new behaviour.
Merge pull request #216 from igrekster/master

Update unit tests