remove TODO tags "use FactoryGirl"
add specs for feature 2, fixes #2
extend event factory a little