minor cleanup to zfs-related code from testing