update tests to support python 3 (and python 2)