Continue converting test from String to new data structured

- Removed trivial and isSimpleExpression
Merge pull request #6 from Patlos/master

Continue converting test from String to new data structured