refs #79: Got the last of the tests passing in both python2 and python3