Fixes null pointer exceptions in the deck model for the JUnit tests