Tests for TrieMatcher; rename some test files