Fixing some goofs + moving tests over for more accurate cov numbers
Merge pull request #8 from modcloth-labs/test-updates-plus-unhork

Fixing some goofs + moving tests over for more accurate cov numbers