Fixed most of the broken tests including python 2.6 incompatibilities
Merge branch 'master' of github.com:umfoida5/comp4350group5