Refactored shuffle spec