Fixed test errors from 053de6131af83c63ec17d38578889c71de913d24 on py3.2.