X-Git-Url: http://nitlanguage.org

diff --git a/src/model/test_model_json.nit b/src/model/test_model_json.nit
index 897dfd5..c544446 100644
--- a/src/model/test_model_json.nit
+++ b/src/model/test_model_json.nit
@@ -12,14 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test_model_json is test_suite
+module test_model_json is test
 
-import test_suite
 import model_json
 import frontend
 
 class TestModelSerialization
-	super TestSuite
+	test
 
 	var suite_path: String = "NIT_TESTING_PATH".environ
 	var lib_path: String = "{suite_path.dirname}/../../tests/test_prog"
@@ -35,7 +34,7 @@ class TestModelSerialization
 		return model
 	end
 
-	fun test_refs_to_full_json do
+	fun test_refs_to_full_json is test do
 		var mentities = new Array[MEntity]
 		mentities.add model.mpackages.first
 		mentities.add model.mmodules.first
@@ -45,13 +44,13 @@ class TestModelSerialization
 		end
 	end
 
-	fun test_packages_to_full_json do
+	fun test_packages_to_full_json is test do
 		for mentity in model.mpackages do
 			print mentity.to_pretty_full_json
 		end
 	end
 
-	fun test_groups_to_full_json do
+	fun test_groups_to_full_json is test do
 		for mpackage in model.mpackages do
 			for mentity in mpackage.mgroups do
 				print mentity.to_pretty_full_json
@@ -59,19 +58,19 @@ class TestModelSerialization
 		end
 	end
 
-	fun test_modules_to_full_json do
+	fun test_modules_to_full_json is test do
 		for mentity in model.mmodules do
 			print mentity.to_pretty_full_json
 		end
 	end
 
-	fun test_classes_to_full_json do
+	fun test_classes_to_full_json is test do
 		for mentity in model.mclasses do
 			print mentity.to_pretty_full_json
 		end
 	end
 
-	fun test_classdefs_to_full_json do
+	fun test_classdefs_to_full_json is test do
 		for mclass in model.mclasses do
 			for mentity in mclass.mclassdefs do
 				print mentity.to_pretty_full_json
@@ -79,13 +78,13 @@ class TestModelSerialization
 		end
 	end
 
-	fun test_props_to_full_json do
+	fun test_props_to_full_json is test do
 		for mentity in model.mproperties do
 			print mentity.to_pretty_full_json
 		end
 	end
 
-	fun test_propdefs_to_full_json do
+	fun test_propdefs_to_full_json is test do
 		for mprop in model.mproperties do
 			for mentity in mprop.mpropdefs do
 				print mentity.to_pretty_full_json