Merge "Refactor PatternTest"