Use EventPump and cotest in the tests (and alphabetize)