diff --git a/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor b/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor
index 9dc8a96..e6777d3 100644
Binary files a/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor and b/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor differ
diff --git a/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor b/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor
index 261908e..b74feda 100644
Binary files a/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor and b/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor differ
diff --git a/token/delegation/delegationtest/data/TokenErinFrank_InvalidExpired.dagcbor b/token/delegation/delegationtest/data/TokenErinFrank_InvalidExpired.dagcbor
index 382f1c9..64b9328 100644
Binary files a/token/delegation/delegationtest/data/TokenErinFrank_InvalidExpired.dagcbor and b/token/delegation/delegationtest/data/TokenErinFrank_InvalidExpired.dagcbor differ
diff --git a/token/delegation/delegationtest/generator/generator.go b/token/delegation/delegationtest/generator/generator.go
index d695a11..771346f 100644
--- a/token/delegation/delegationtest/generator/generator.go
+++ b/token/delegation/delegationtest/generator/generator.go
@@ -1,7 +1,9 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"go/format"
 	"os"
 	"path/filepath"
 	"slices"
@@ -202,72 +204,71 @@ func (g *generator) createProofChain(name string, prf []cid.Cid) {
 }
 
 func (g *generator) writeGoFile() error {
-	var err error
+	buf := bytes.NewBuffer(nil)
 
-	f, err := os.Create("../token_gen.go")
-	if err != nil {
-		return err
-	}
+	Println := func(a ...any) { _, _ = fmt.Fprintln(buf, a...) }
+	Printf := func(format string, a ...any) { _, _ = fmt.Fprintf(buf, format, a...) }
 
-	defer func() {
-		err = f.Close()
-	}()
-
-	_, _ = fmt.Fprintln(f, "// Code generated by delegationtest - DO NOT EDIT.")
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "package delegationtest")
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "import (")
-	_, _ = fmt.Fprintln(f, "\t\"github.com/ipfs/go-cid\"")
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "\t\"github.com/ucan-wg/go-ucan/token/delegation\"")
-	_, _ = fmt.Fprintln(f, ")")
+	Println("// Code generated by delegationtest - DO NOT EDIT.")
+	Println()
+	Println("package delegationtest")
+	Println()
+	Println("import (")
+	Println("\t\"github.com/ipfs/go-cid\"")
+	Println()
+	Println("\t\"github.com/ucan-wg/go-ucan/token/delegation\"")
+	Println(")")
 
 	refs := make(map[cid.Cid]string, len(g.dlgs))
 
 	for _, d := range g.dlgs {
 		refs[d.id] = d.name + "CID"
 
-		_, _ = fmt.Fprintln(f)
-		_, _ = fmt.Fprintln(f, "var (")
-		_, _ = fmt.Fprintf(f, "\t%sCID    = cid.MustParse(\"%s\")\n", d.name, d.id.String())
-		_, _ = fmt.Fprintf(f, "\t%sSealed = mustGetBundle(%s).Sealed\n", d.name, d.name+"CID")
-		_, _ = fmt.Fprintf(f, "\t%sBundle = mustGetBundle(%s)\n", d.name, d.name+"CID")
-		_, _ = fmt.Fprintf(f, "\t%s       = mustGetBundle(%s).Decoded\n", d.name, d.name+"CID")
-		_, _ = fmt.Fprintln(f, ")")
+		Println()
+		Println("var (")
+		Printf("\t%sCID    = cid.MustParse(\"%s\")\n", d.name, d.id.String())
+		Printf("\t%sSealed = mustGetBundle(%s).Sealed\n", d.name, d.name+"CID")
+		Printf("\t%sBundle = mustGetBundle(%s)\n", d.name, d.name+"CID")
+		Printf("\t%s       = mustGetBundle(%s).Decoded\n", d.name, d.name+"CID")
+		Println(")")
 	}
 
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "var AllTokens = []*delegation.Token{")
+	Println()
+	Println("var AllTokens = []*delegation.Token{")
 	for _, d := range g.dlgs {
-		_, _ = fmt.Fprintf(f, "\t%s,\n", d.name)
+		Printf("\t%s,\n", d.name)
 	}
-	_, _ = fmt.Fprintln(f, "}")
+	Println("}")
 
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "var AllBundles = []*delegation.Bundle{")
+	Println()
+	Println("var AllBundles = []*delegation.Bundle{")
 	for _, d := range g.dlgs {
-		_, _ = fmt.Fprintf(f, "\t%sBundle,\n", d.name)
+		Printf("\t%sBundle,\n", d.name)
 	}
-	_, _ = fmt.Fprintln(f, "}")
+	Println("}")
 
-	_, _ = fmt.Fprintln(f)
-	_, _ = fmt.Fprintln(f, "var cidToName = map[cid.Cid]string{")
+	Println()
+	Println("var cidToName = map[cid.Cid]string{")
 	for _, d := range g.dlgs {
-		_, _ = fmt.Fprintf(f, "\t%sCID: \"%s\",\n", d.name, d.name)
+		Printf("\t%sCID: \"%s\",\n", d.name, d.name)
 	}
-	_, _ = fmt.Fprintln(f, "}")
+	Println("}")
 
 	for _, c := range g.chains {
-		_, _ = fmt.Fprintln(f)
-		_, _ = fmt.Fprintf(f, "var %s = []cid.Cid{\n", c.name)
+		Println()
+		Printf("var %s = []cid.Cid{\n", c.name)
 
 		for _, d := range slices.Backward(c.prf) {
-			_, _ = fmt.Fprintf(f, "\t%s,\n", refs[d])
+			Printf("\t%s,\n", refs[d])
 		}
 
-		_, _ = fmt.Fprintln(f, "}")
+		Println("}")
 	}
 
-	return err
+	out, err := format.Source(buf.Bytes())
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile("../token_gen.go", out, 0666)
 }
diff --git a/token/delegation/delegationtest/token_gen.go b/token/delegation/delegationtest/token_gen.go
index 008e992..5983c6a 100644
--- a/token/delegation/delegationtest/token_gen.go
+++ b/token/delegation/delegationtest/token_gen.go
@@ -107,21 +107,21 @@ var (
 )
 
 var (
-	TokenCarolDan_InvalidExpiredCID    = cid.MustParse("bafyreic7cpi2j65je6rwiyxzq233lpbljvl6ggs5ew53nnye3tc3jdltqm")
+	TokenCarolDan_InvalidExpiredCID    = cid.MustParse("bafyreigvdcarp6426e5aenal3q3c4uyhncwfbmt3fsmb4qzspkpjy57gti")
 	TokenCarolDan_InvalidExpiredSealed = mustGetBundle(TokenCarolDan_InvalidExpiredCID).Sealed
 	TokenCarolDan_InvalidExpiredBundle = mustGetBundle(TokenCarolDan_InvalidExpiredCID)
 	TokenCarolDan_InvalidExpired       = mustGetBundle(TokenCarolDan_InvalidExpiredCID).Decoded
 )
 
 var (
-	TokenDanErin_InvalidExpiredCID    = cid.MustParse("bafyreiguafxrlpncpjxxfuled2izocjp5s3kcclkdl4edpd22tr2gfcad4")
+	TokenDanErin_InvalidExpiredCID    = cid.MustParse("bafyreifa265mung4nfpjjuiir5nytzgbrhfl66ye2dqmbq4p6dm7bzp4he")
 	TokenDanErin_InvalidExpiredSealed = mustGetBundle(TokenDanErin_InvalidExpiredCID).Sealed
 	TokenDanErin_InvalidExpiredBundle = mustGetBundle(TokenDanErin_InvalidExpiredCID)
 	TokenDanErin_InvalidExpired       = mustGetBundle(TokenDanErin_InvalidExpiredCID).Decoded
 )
 
 var (
-	TokenErinFrank_InvalidExpiredCID    = cid.MustParse("bafyreid4blvceraqiz32vca4gwk2hcf7dqtu6ydpmq3xlbj5biiq46mo44")
+	TokenErinFrank_InvalidExpiredCID    = cid.MustParse("bafyreicde2per7ynjruvstuae67dxzdg2iepid3nonrmgr6tvodzpbqomu")
 	TokenErinFrank_InvalidExpiredSealed = mustGetBundle(TokenErinFrank_InvalidExpiredCID).Sealed
 	TokenErinFrank_InvalidExpiredBundle = mustGetBundle(TokenErinFrank_InvalidExpiredCID)
 	TokenErinFrank_InvalidExpired       = mustGetBundle(TokenErinFrank_InvalidExpiredCID).Decoded
@@ -222,29 +222,29 @@ var AllBundles = []*delegation.Bundle{
 }
 
 var cidToName = map[cid.Cid]string{
-	TokenAliceBobCID: "TokenAliceBob",
-	TokenBobCarolCID: "TokenBobCarol",
-	TokenCarolDanCID: "TokenCarolDan",
-	TokenDanErinCID: "TokenDanErin",
-	TokenErinFrankCID: "TokenErinFrank",
-	TokenCarolDan_InvalidExpandedCommandCID: "TokenCarolDan_InvalidExpandedCommand",
-	TokenDanErin_InvalidExpandedCommandCID: "TokenDanErin_InvalidExpandedCommand",
+	TokenAliceBobCID:                         "TokenAliceBob",
+	TokenBobCarolCID:                         "TokenBobCarol",
+	TokenCarolDanCID:                         "TokenCarolDan",
+	TokenDanErinCID:                          "TokenDanErin",
+	TokenErinFrankCID:                        "TokenErinFrank",
+	TokenCarolDan_InvalidExpandedCommandCID:  "TokenCarolDan_InvalidExpandedCommand",
+	TokenDanErin_InvalidExpandedCommandCID:   "TokenDanErin_InvalidExpandedCommand",
 	TokenErinFrank_InvalidExpandedCommandCID: "TokenErinFrank_InvalidExpandedCommand",
-	TokenCarolDan_ValidAttenuatedCommandCID: "TokenCarolDan_ValidAttenuatedCommand",
-	TokenDanErin_ValidAttenuatedCommandCID: "TokenDanErin_ValidAttenuatedCommand",
+	TokenCarolDan_ValidAttenuatedCommandCID:  "TokenCarolDan_ValidAttenuatedCommand",
+	TokenDanErin_ValidAttenuatedCommandCID:   "TokenDanErin_ValidAttenuatedCommand",
 	TokenErinFrank_ValidAttenuatedCommandCID: "TokenErinFrank_ValidAttenuatedCommand",
-	TokenCarolDan_InvalidSubjectCID: "TokenCarolDan_InvalidSubject",
-	TokenDanErin_InvalidSubjectCID: "TokenDanErin_InvalidSubject",
-	TokenErinFrank_InvalidSubjectCID: "TokenErinFrank_InvalidSubject",
-	TokenCarolDan_InvalidExpiredCID: "TokenCarolDan_InvalidExpired",
-	TokenDanErin_InvalidExpiredCID: "TokenDanErin_InvalidExpired",
-	TokenErinFrank_InvalidExpiredCID: "TokenErinFrank_InvalidExpired",
-	TokenCarolDan_InvalidInactiveCID: "TokenCarolDan_InvalidInactive",
-	TokenDanErin_InvalidInactiveCID: "TokenDanErin_InvalidInactive",
-	TokenErinFrank_InvalidInactiveCID: "TokenErinFrank_InvalidInactive",
-	TokenCarolDan_ValidExamplePolicyCID: "TokenCarolDan_ValidExamplePolicy",
-	TokenDanErin_ValidExamplePolicyCID: "TokenDanErin_ValidExamplePolicy",
-	TokenErinFrank_ValidExamplePolicyCID: "TokenErinFrank_ValidExamplePolicy",
+	TokenCarolDan_InvalidSubjectCID:          "TokenCarolDan_InvalidSubject",
+	TokenDanErin_InvalidSubjectCID:           "TokenDanErin_InvalidSubject",
+	TokenErinFrank_InvalidSubjectCID:         "TokenErinFrank_InvalidSubject",
+	TokenCarolDan_InvalidExpiredCID:          "TokenCarolDan_InvalidExpired",
+	TokenDanErin_InvalidExpiredCID:           "TokenDanErin_InvalidExpired",
+	TokenErinFrank_InvalidExpiredCID:         "TokenErinFrank_InvalidExpired",
+	TokenCarolDan_InvalidInactiveCID:         "TokenCarolDan_InvalidInactive",
+	TokenDanErin_InvalidInactiveCID:          "TokenDanErin_InvalidInactive",
+	TokenErinFrank_InvalidInactiveCID:        "TokenErinFrank_InvalidInactive",
+	TokenCarolDan_ValidExamplePolicyCID:      "TokenCarolDan_ValidExamplePolicy",
+	TokenDanErin_ValidExamplePolicyCID:       "TokenDanErin_ValidExamplePolicy",
+	TokenErinFrank_ValidExamplePolicyCID:     "TokenErinFrank_ValidExamplePolicy",
 }
 
 var ProofAliceBob = []cid.Cid{