Improve and refactor specs