Fix py3k tests