fixes tests
Merge branch 'master' of github.com:Twigz/uncrustify into feature/fix-local-block