Spec helper updates for more consistency
Merge pull request #30 from mhaskel/spec_updates

Spec helper updates for more consistency