Added tests for Hyphenate, sorted out whitespace issues.