refactored specs into suite