Made tests use six for universal python versions for travis