Adding tests for new matcher code