updating tests
Merge branch 'master' of https://github.com/mdotson1/cs338f13p2