Merge pull request #1722 from besser82/develop

fix trailing and before tab whitespace
fix unit tests