Merged Sam's pull request #375
There was a conflict between Lisa's tests for Decks, and Sam's new deck stuff, because Sam deleted those files.  But the old tests still work with the new setup because the names are the same, so I'm leaving the tests in.

Signed-off-by: ajthompson