Flattened out some test to avoid branching
Merge branch 'master' of github.com:jschmerge/xos
Respin of unicode stuff with cleanups and proper standards convormance