Refactor tests to be anal about whitespace
Refactor tests to be anal about naming