More robust tests, support for Char