Add some more testing/neaten things
Clean up some wchar compares