Refactored specs a little