update to tests
Merge branch 'master' of https://github.com/salsa23/Prog272-Hiatt