Merge pull request #396 from fantix/test_support

Remove test_support.py
Replace obvious unicode() with text_type.