More progress on events tests, with a stubborn one that won't pass