fix py2-vs-3 problems in new tests