A bit of refactoring
Changes the model for Decks
Adds a factory for the tests