Minor updates to testing
Add Gre (test vocabulary is currently wrong)