fixing tests, unformatted does not mean strips whitespaces, it means the format does not change.
Merge branch 'master' into go1