Refactor specs and additional helper spec