Adds 2 additional tests
Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/avalon