Update operators
Move all regular expression to the global scope and fix some order issues
Add more tests