fix a bug in the syntax highlighting patterns
restructure test file