Improved test fixtures.