Test and implement review
Refactor specs