Adds more specs and changes the options
Refactor Deck creation