diff --git a/tests/generator-Tests/expected.ji/NonStaticFields/NonStaticField.xml b/tests/generator-Tests/expected.ji/NonStaticFields/NonStaticField.xml
index 20083ca1b..29e293914 100644
--- a/tests/generator-Tests/expected.ji/NonStaticFields/NonStaticField.xml
+++ b/tests/generator-Tests/expected.ji/NonStaticFields/NonStaticField.xml
@@ -10,7 +10,7 @@
 	  		<field deprecated="not deprecated" final="true" name="Value" static="false" transient="false" type="int" type-generic-aware="int" visibility="public" volatile="false">
 	        </field>
 	    <field deprecated="not deprecated" final="false" name="BooleanValue" static="false" transient="false" type="boolean" type-generic-aware="int" visibility="public" volatile="false" />
-	    <field deprecated="not deprecated" final="false" name="CharValue" static="false" transient="false" type="boolean" type-generic-aware="int" visibility="public" volatile="false" />
+	    <field deprecated="not deprecated" final="false" name="CharValue" static="false" transient="false" type="char" type-generic-aware="int" visibility="public" volatile="false" />
 	    </class>
 	</package>
 </api>
diff --git a/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs
index ec63804a3..0edd8c70f 100644
--- a/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs
@@ -57,15 +57,15 @@ public bool BooleanValue {
 
 
 		// Metadata.xml XPath field reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/field[@name='CharValue']"
-		public bool CharValue {
+		public char CharValue {
 			get {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
-				var __v = _members.InstanceFields.GetBooleanValue (__id, this);
+				var __v = _members.InstanceFields.GetCharValue (__id, this);
 				return __v;
 			}
 			set {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value);
diff --git a/tests/generator-Tests/expected.ji/StaticFields/StaticField.xml b/tests/generator-Tests/expected.ji/StaticFields/StaticField.xml
index 186a4660c..fb810c114 100644
--- a/tests/generator-Tests/expected.ji/StaticFields/StaticField.xml
+++ b/tests/generator-Tests/expected.ji/StaticFields/StaticField.xml
@@ -12,7 +12,7 @@
 	        <field deprecated="not deprecated" final="false" name="Value2" static="true" transient="false" type="int" type-generic-aware="int" visibility="public" volatile="false">
 	        </field>
 	    <field deprecated="not deprecated" final="false" name="BooleanValue" static="true" transient="false" type="boolean" type-generic-aware="int" visibility="public" volatile="false" />
-	    <field deprecated="not deprecated" final="false" name="CharValue" static="true" transient="false" type="boolean" type-generic-aware="int" visibility="public" volatile="false" />
+	    <field deprecated="not deprecated" final="false" name="CharValue" static="true" transient="false" type="char" type-generic-aware="int" visibility="public" volatile="false" />
 	    </class>
 	</package>
 </api>
diff --git a/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs
index 3b0169b78..8d567d71e 100644
--- a/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs
@@ -68,15 +68,15 @@ public static bool BooleanValue {
 
 
 		// Metadata.xml XPath field reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/field[@name='CharValue']"
-		public static bool CharValue {
+		public static char CharValue {
 			get {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
-				var __v = _members.StaticFields.GetBooleanValue (__id);
+				var __v = _members.StaticFields.GetCharValue (__id);
 				return __v;
 			}
 			set {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
 				try {
 					_members.StaticFields.SetValue (__id, value);
diff --git a/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs
index f4988e1ce..3fa463e60 100644
--- a/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs
@@ -61,15 +61,15 @@ public bool BooleanValue {
 
 		// Metadata.xml XPath field reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/field[@name='CharValue']"
 		[Register ("CharValue")]
-		public bool CharValue {
+		public char CharValue {
 			get {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
-				var __v = _members.InstanceFields.GetBooleanValue (__id, this);
+				var __v = _members.InstanceFields.GetCharValue (__id, this);
 				return __v;
 			}
 			set {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value);
diff --git a/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs
index 5fd889924..261590db7 100644
--- a/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs
@@ -73,15 +73,15 @@ public static bool BooleanValue {
 
 		// Metadata.xml XPath field reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/field[@name='CharValue']"
 		[Register ("CharValue")]
-		public static bool CharValue {
+		public static char CharValue {
 			get {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
-				var __v = _members.StaticFields.GetBooleanValue (__id);
+				var __v = _members.StaticFields.GetCharValue (__id);
 				return __v;
 			}
 			set {
-				const string __id = "CharValue.Z";
+				const string __id = "CharValue.C";
 
 				try {
 					_members.StaticFields.SetValue (__id, value);