Refine unit test: escape/non escape/fields test
Add outside pattern parse support
Add escape field parse
Merge remote/master