Fix tests. Emitted events weren't yet renamed in the tests.