Started refactoring decks spec
Refactored decks spec