Simplify test code a bit by ensuring that the setup method completely sets up the fixture.