Tests pass for both python2 and python3 now.