Move some event declarations into higher level contracts
and delete a setUp function that was doing nothing but calling
super.setUp.

This allows us to more easily reuse the events across different
tests.