wip commit: refactoring specs