Formatting
Fix test
Merge pull request #1446 from erwinwinder/master

Fix test