Fixing test breaks.