Refactor spec samples