lets DRY
adjust specs
Merge pull request #444 from devton/master

lets DRY