Attempt initial fix for failing tests.