fixed unit tests that were breaking on python2.6/ubuntu
Merge pull request #272 from shatterednirvana/unit-test-fixes

fixed unit tests that were breaking on python2.6/ubuntu