Minor clean up of Deck

With bonus 100% coverage of unittest.