Refactor spec examples