fix failing unit tests post merge to master

Author: Mpdreamz

src/Tests/Mapping/Types/Core/String/StringMappingTests.cs

@@ -61,17 +61,19 @@ public class StringMappingTests : TypeMappingTestBase<StringTest>
 				{
 					type = "string"
 				},
-				inferred = new
-				{
-					type = "string"
+				inferred = new {
+					type = "text",
+					fields = new {
+						keyword = new { type = "keyword" }
+					}
 				},
 				@char = new
 				{
-					type = "string"
+					type = "keyword"
 				},
 				guid = new
 				{
-					type = "string"
+					type = "keyword"
 				}
 			}
 		};

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 5.0.0-alpha1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running