Fixes make test, adds python 2.6