Factory for Terms, adjust tests to fit terms.
Merge remote-tracking branch 'upstream/develop' into feature/book-1011-check-terms
Merge pull request #1301 from onepercentclub/feature/book-1011-check-terms

Factory for Terms, adjust tests to fit terms.