Remove TODOs
Refactor specs