refactored specs
refactored specs after code review