Fix unit tests and change whitespace check.