Fixed test fixture, more deck tests.