Partial _String unit test and some code cleanup