@Test
    public void testDiamond() {
        Suit s = Suit.DIAMOND;
        assertEquals("d", s.getShortName());
        assertTrue(allSuits.contains(s));
        assertEquals(s, stringToSuitMap.get("d"));        
    }