Get tests passing on Python 3.2