Subevent model tests
Merge branch 'master' of github.com:kevsherman/bbk_final_project