normalize whitespace
Merge branch 'rename-tests' into patch-3