Tests: clean up whitespace
Clean up whitespace
Merge branch 'master' into Tests