Fixed some tests that broke because of changing the discard pile.