Refactor and dry specs