Refacored specs