Refactor specs
Finish updating specs