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

Formatter testfix
Merge branch 'master' of github.com:buren/enduro into Review_Story_10