Fix test errors from reorded Unsafe list