Simplify IncludePattern and add a few more tests to PatternTestCase.