Prefer `if/else` over `unless/else`
Added missing test_helper require
Merge pull request #18 from fredwu/misc_tweaks

Misc tweaks