Clean up in test project and minor changes to Deck