Index: tests/raii/ctor-autogen.cfa
===================================================================
--- tests/raii/ctor-autogen.cfa	(revision fd54fef231baeeb0016103bf19cc8e6d87287faf)
+++ tests/raii/ctor-autogen.cfa	(revision ee8f72dd8b2ecc7a43d3a3fe98dbd7931d8f768e)
@@ -1,5 +1,5 @@
 // TODO: add error cases (e.g., use of field constructors for managed types, etc.)
 
-enum Color { R, G, B };
+enum Colour { R, G, B };
 
 // empty struct/union should have generated ctor/dtors
@@ -21,5 +21,5 @@
 // struct/union with members with generated ctor/dtors should themselves have generated ctor/dtors
 union PopulatedUnion {
-	Color c;
+	Colour c;
 	U u;
 	S s;
@@ -27,5 +27,5 @@
 
 struct PopulatedStruct {
-	Color c;
+	Colour c;
 	U u;
 	S s;
@@ -109,8 +109,8 @@
 	S s;
 	U u;
-	Color e;
+	Colour e = R;
 
-	// identity(R);  Color constant should be Color which is otype
-	identity(e);  // Color should be an otype
+	// identity(R);  Colour constant should be Colour which is otype
+	identity(e);  // Colour should be an otype
 	identity(u);  // U should be an otype
 	identity(s);  // S should be an otype
@@ -139,6 +139,6 @@
 	identity(dsi);
 	identity(dsd);
-	// identity(dui); // xxx - codegen errors in generated thunk _temp3 (Box-pass-generated assignment return-temporary)
-	// identity(dud);
+	identity(dui);
+	identity(dud);
 	identity(dssi);
 	identity(dssf);