diff --git a/src/utils/evform.py b/src/utils/evform.py
index fb7b44e296..3d99aeb7c9 100644
--- a/src/utils/evform.py
+++ b/src/utils/evform.py
@@ -120,7 +120,7 @@ form will raise an error.
 
 import re
 import copy
-from src.utils.ansi import evform
+from src.utils.ansi import ANSIString
 from src.utils.evtable import Cell, EvTable
 from src.utils.utils import all_from_module, to_str, to_unicode
 
@@ -371,7 +371,7 @@ class EvForm(object):
         self.tablechar = tablechar[0] if len(tablechar) > 1 else tablechar
 
         # split into a list of list of lines. Form can be indexed with form[iy][ix]
-        self.raw_form = to_unicode(datadict.get("FORM", "")).split("\n")
+        self.raw_form = ANSIString(datadict.get("FORM", "")).split("\n")
         # strip first line
         self.raw_form = self.raw_form[1:] if self.raw_form else self.raw_form
 
diff --git a/src/utils/mudform_test.py b/src/utils/evform_test.py
similarity index 100%
rename from src/utils/mudform_test.py
rename to src/utils/evform_test.py