added some incomplete tests
Merge branch 'master' of github.com:Dan-McElroy/PSD-Project--Q