Fixed name
All event tests should run now
Merge branch 'devDan' into dev
Replaced with assert with should calls
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Removed require assert
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Fixing assert
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Just moving back to my branch
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev

Merging changes