Continue converting test from String to new data structured

- Removed trivial and isSimpleExpression