Fix six import in fix_raise_six

Includes tests which should help with #40 .