Merge pull request #736 from ovatsus/master

Promote TextConversions to top level
Fix tests