Improve TestString somewhat