migrate tests to use EventFactory
cleanup test