updates tests, fixes merge conflict in event_section.rb
Merge branch 'event' of github.com:TheConstructors/QwikStubs into event