4 files changed, 52 insertions, 20 deletions

diff --git a/linguistics/src/test/models/docv1.json b/linguistics/src/test/models/docv1.json
new file mode 100644
index 00000000000..04010959a58
--- /dev/null
+++ b/linguistics/src/test/models/docv1.json
@@ -0,0 +1,18 @@
+{
+  "version" : "1.0",
+  "id" : "test::1",
+  "description" : "desc",
+  "languages" : {
+    "en": {
+      "description" : "english model",
+      "document-count" : 10,
+      "language" : "en",
+      "document-frequencies" : {
+        "usa" : 2,
+        "hello": 3,
+        "world": 5,
+        "test": 2
+      }
+    }
+  }
+}
diff --git a/linguistics/src/test/models/docv2.json b/linguistics/src/test/models/docv2.json
new file mode 100644
index 00000000000..c00d02fb744
--- /dev/null
+++ b/linguistics/src/test/models/docv2.json
@@ -0,0 +1,31 @@
+{
+  "version" : "2.0",
+  "id" : "test::2",
+  "description" : "desc",
+  "languages" : {
+    "en": {
+      "description" : "english model",
+      "document-count" : 14,
+      "document-frequencies" : {
+        "usa" : 2,
+        "hello": 3,
+        "world": 5,
+        "test": 4,
+        "additional": 2
+      }
+    },
+    "nb": {
+      "description" : "norwegian model",
+      "document-count" : 20,
+      "document-frequencies" : {
+        "usa" : 2,
+        "hello": 10,
+        "verden": 5,
+        "test": 2,
+        "norge": 11,
+        "ja": 12,
+        "nei": 3
+      }
+    }
+  }
+}
diff --git a/linguistics/src/test/models/en.json b/linguistics/src/test/models/en.json
index 50bae5e3451..87b7b2faa08 100644
--- a/linguistics/src/test/models/en.json
+++ b/linguistics/src/test/models/en.json
@@ -1,11 +1,11 @@
 {
   "version" : "1.0",
   "id" : "test::1",
-  "description" : "desc",
-  "corpus-size" : 10,
+  "description" : "english model",
+  "document-count" : 10,
   "language" : "en",
   "word-count" : 4,
-  "frequencies" : {
+  "document-frequencies" : {
     "usa" : 2,
     "hello": 3,
     "world": 5,
diff --git a/linguistics/src/test/models/no.json b/linguistics/src/test/models/no.json
deleted file mode 100644
index 5fca8929e74..00000000000
--- a/linguistics/src/test/models/no.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version" : "1.0",
-  "id" : "test::2",
-  "description" : "norsk beskrivelse",
-  "corpus-size" : 20,
-  "language" : "nb",
-  "word-count" : 7,
-  "frequencies" : {
-    "usa" : 2,
-    "hello": 10,
-    "verden": 5,
-    "test": 2,
-    "norge": 11,
-    "ja": 12,
-    "nei": 3
-  }
-}