adding in an exception when adding a test, also fixing a bug when deleting stuff
Merge branch 'master' of https://github.com/lctyler/309