New tests for terminology
Minor changes