Fix python3 issues in previous commits (types.StringTypes is gone, unittest2 is only for python2.x)