More tests
Handle unhandled exceptions, if they occur, to prevent the app from crashing. Removed a few small vestigal peices of code, and verified that the tests are still working correctly.
Merge branch 'dev' of github.com:c1moore/cen3031project into dev