Use six in tests to support python2 and 3