Updated classes and specs, primarily for working with methods in PokerRules