Fixing test changes.