de-brittle unit tests (fixes #2 and #3)
fix tabs/spaces, naming conventions
Merge pull request #7 from andrewbt/topic/fix-tests

de-brittle unit tests (fixes #2 and #3)