Test refactor, SimpleTerm added