Refactor specs to use helpers in headers