Fixes two broken tests. Fixes a problem in tests with Python2/Python3 compability.