Added spade and diamond test