Test updates - use helpers library
Add six.py, tweak string-handling a bit