Add the new stuff for tests and db
Merge pull request #2 from bcarroll22/develop

Add the new stuff for tests and db
Merge branch 'bcarroll22-master' into develop
Fixed merge conflicts