refs #79: Fixed some broken tests for python 2.