Fix for changes in test fixtures.