Fix unit tests and change whitespace check.
Merge pull request #1 from mrsellars/fix_tests

Fix unit tests and change whitespace check.