wip - refactored specs