Modified tests for python 3 compatibility