Cleanup. Fixing eventd test.