Factory for Terms, adjust tests to fit terms.