Use six.string_types in tests