Add new test utility and fix event model tests