added tests and fixed events
Merge pull request #2 from Jessica-L/noahs-branch

added tests and fixed events