Further fixed whitespace and updated tests.