fix specs to work with refactored code