More tests and commonalised some of the test code for adding decks