Cleanup TestHarness - punctuation, optional semis, etc