Break up spec into smaller tests