reenabled some tests
renamed StringGrammarDefinition -> String
renamed RegularExpressionDefinition -> RegularExpression
Merge branch 'master' into match