Spec helpers refactored