refactored specs to reflect UI changes