Stop adding unwanted spaces (issue 26)

Please consider for application. The test suite is adjusted accordingly so that the full test suite passes, again.