Improved the test file, plus some other minor things with verbs