Fix test failures on Python 2.7.  References #7