Completed test suite and fixed all issues found
Fixing issues with tests in python 2.6