@@ -72,11 +72,15 @@
 		    set prev $group
 		    puts $out ""
 		}
 
 		# Test case
-		set buffer [format "\ntest %s-%d.%d {%s}" $group $test [incr cases($group)] $name]
+		if {[string index $name 0] ne {$}} {
+		    set buffer [format "\ntest %s-%d.%d {%s}" $group $test [incr cases($group)] $name]
+		} else {
+		    set buffer [format "\ntest %s-%d.%d %s" $group $test [incr cases($group)] $name]
+		}
 		foreach opt [list -constraints -setup -body -cleanup -match -result -output -errorOutput -returnCodes] {
 		    set cmd [string trim [set [string trimleft $opt "-"]]]
 		    if {$cmd ne ""} {
 			if {$opt in [list -setup -body -cleanup]} {
 			    append buffer " " $opt " \{\n"
@@ -85,11 +89,11 @@
 			    }
 			    append buffer "    \}"
 			} elseif {$opt in [list -output -errorOutput]} {
 			    append buffer " " $opt " {" $cmd \n "}"
 			} elseif {$opt in [list -result]} {
-			    if {[string index $cmd 0] in [list \[ \" \{]} {
+			    if {[string index $cmd 0] in [list \[ \" \{ \$]} {
 				append buffer " " $opt " " $cmd
 			    } elseif {[string match {*[\\$]*} $cmd]} {
 				append buffer " " $opt " \"" [string map [list \\\\\" \\\"] [string map [list \" \\\" ] $cmd]] "\""
 			    } else {
 				append buffer " " $opt " {" $cmd "}"
@@ -101,10 +105,11 @@
 		}
 		puts $out $buffer
 
 	    } else {
 		# Empty line
+		puts $out ""
 	    }
 	    break
 	}
     }