Fix tests for python 2