WIP, refactor specs