fix some 3.4 test failures before giving up

Just too many differences to do right now. Tox is set up if anyone else
wants to try...