FormatterTest
Fixed merge conflicts
Merge pull request #90 from buren/Formatter_testfix

Formatter testfix
fixed merge conflicts