Added boltzman/Poker hybrid; made minor test changes