renaming events.rb to event.rb, changes to test code