Whitespace, comments, scaffolding cruft removed
Refactored tests for readiblity, redundancy elimination