Tweak tests for Python 2.7 and 3.3