[WIP] refactor specs