Fixing test errors.