Remove usage of 'six' module in tests