Clean up event_spec
Get rid of code that only tests the tests