Simplified unit test, and cleaned whitespace