Move some specs into shared example group
Move more specs into shared example group