Index: tests/enum_tests/.expect/anonymous.txt
===================================================================
--- tests/enum_tests/.expect/anonymous.txt	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/.expect/anonymous.txt	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
Index: tests/enum_tests/.expect/stringEnum.txt
===================================================================
--- tests/enum_tests/.expect/stringEnum.txt	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/.expect/stringEnum.txt	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -1,1 +1,2 @@
 zero: zero, one: one
+zero: 0, one: 1
Index: tests/enum_tests/anonymous.cfa
===================================================================
--- tests/enum_tests/anonymous.cfa	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/anonymous.cfa	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -1,7 +1,7 @@
-#include <stdio.h>
+#include <fstream.hfa>
 enum(unsigned long int ) { nthreads = 17 };
 
 int main() {
-    printf("%lu", nthreads);
+    sout | nthreads;
 }
 
Index: tests/enum_tests/enumInlineValue.cfa
===================================================================
--- tests/enum_tests/enumInlineValue.cfa	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/enumInlineValue.cfa	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -12,5 +12,5 @@
     enum enumB val = A;
     sout | "enumB.A is" | val;
-    enum enumB val2= enumB.B;
+    enum enumB val2 = enumB.B;
     sout | "enumB.B is" | val2;
     sout | "enumB.D is" | enumB.D;
Index: tests/enum_tests/position.cfa
===================================================================
--- tests/enum_tests/position.cfa	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/position.cfa	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -12,12 +12,12 @@
 
 int main () {
-    Colour fishy; // posE()
-    fishy = Colour.Green; // value(fishy) = Colour.Green;
-    fishy; // valueE( fishy );
+    Colour fishy;
+    fishy = Colour.Green; 
+    fishy;
+    Colour c2 = fishy;
 
-    printf( "Compile Time: blue value: %s, position: %d, label: %s, default return value: %s \n", valueE(Colour.Blue), posE(Colour.Blue), labelE(Colour.Blue), Colour.Blue );
-    printf( "Runtime: fishy value: %s, position: %d, label: %s, default return value: %s\n", valueE(fishy), posE(fishy), labelE(fishy), fishy );
-    Colour c2 = fishy;
-    printf( "Runtime: C2 value: %s, position: %d, label: %s, default return value: %s\n", valueE(c2), posE(c2), labelE(c2), c2 );
+    sout | "Compile Time: blue value: " | valueE(Colour.Blue) | ", position: " | posE(Colour.Blue) | ", label: " | labelE(Colour.Blue) | ", default return value: " | Colour.Blue;
+    sout | "Runtime: fishy value: " | valueE(fishy) | ", position: " | posE(fishy) | ", label: " | labelE(fishy) | ", default return value: " | fishy;
+    sout | "Runtime: C2 value: " | valueE(c2) | ", position: " | posE(c2) | ", label: " | labelE(c2) | ", default return value: " | c2;
     Colour.Red;
     char * ao = Colour.Red;
@@ -29,3 +29,4 @@
     Plain a = B;
     printf( "%d \n", a );
+    
 }
Index: tests/enum_tests/stringEnum.cfa
===================================================================
--- tests/enum_tests/stringEnum.cfa	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/stringEnum.cfa	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -1,2 +1,3 @@
+#include <fstream.hfa>
 #include <stdio.h>
 
@@ -7,5 +8,6 @@
 
 int main() {
-    printf("zero: %s, one: %s\n", zero, one);
+    sout | "zero: "| zero | ", one: " | one;
+    printf("zero: %d, one: %d\n", zero, one);
     return 0;
 }
Index: tests/enum_tests/typedIntEnum.cfa
===================================================================
--- tests/enum_tests/typedIntEnum.cfa	(revision c17dc80e8b27ae7339c64fb486e005e85e49377f)
+++ tests/enum_tests/typedIntEnum.cfa	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
@@ -1,3 +1,3 @@
-#include <stdio.h>
+#include <fstream.hfa>
 
 enum(int) IntEnum {
@@ -12,11 +12,11 @@
 
 int main() {
-    printf("0=%d\n", zero);
-    printf("1=%d\n", one);
-    printf("1000=%d\n", thousand);
-    printf("1001=%d\n", thousand_one);
-    printf("2000=%d\n", two_thousand);
-    printf("2001=%d\n", two_thousand_one);
-    printf("2002=%d\n", two_thousand_two);
+    sout | "0=" | zero;
+    sout | "1=" | one;
+    sout | "1000=" | thousand;
+    sout | "1001=" | thousand_one;
+    sout | "2000=" | two_thousand;
+    sout | "2001=" | two_thousand_one;
+    sout | "2002=" | two_thousand_two;
     return 0;
 }