Refactor Spec

A small refactoring to keep the specs DRY. What do you think?