Fix more tests on event and worker