diff --git a/test/data/msmi/CraneController_OspModelDescription.xml b/test/data/msmi/CraneController_OspModelDescription.xml
index 7f57297bf..f5f79d28e 100644
--- a/test/data/msmi/CraneController_OspModelDescription.xml
+++ b/test/data/msmi/CraneController_OspModelDescription.xml
@@ -1,10 +1,18 @@
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -12,9 +20,9 @@
-
-
-
+
+
+
diff --git a/test/data/msmi/schema/OspModelDescription.xsd b/test/data/msmi/schema/OspModelDescription.xsd
index 7b5aaba13..c9465839c 100644
--- a/test/data/msmi/schema/OspModelDescription.xsd
+++ b/test/data/msmi/schema/OspModelDescription.xsd
@@ -2,9 +2,17 @@
+
+
+
+
+
+
+
+
@@ -24,5 +32,6 @@
+
diff --git a/test/data/msmi/schema/fmi2Unit.xsd b/test/data/msmi/schema/fmi2Unit.xsd
new file mode 100644
index 000000000..ff3f395c5
--- /dev/null
+++ b/test/data/msmi/schema/fmi2Unit.xsd
@@ -0,0 +1,122 @@
+
+
+
+
+
+Copyright(c) 2008-2011 MODELISAR consortium,
+ 2012-2013 Modelica Association Project "FMI".
+ All rights reserved.
+This file is licensed by the copyright holders under the BSD 2-Clause License
+(http://www.opensource.org/licenses/bsd-license.html):
+----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+- Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+----------------------------------------------------------------------------
+
+with the extension:
+
+You may distribute or publicly perform any modification only under the
+terms of this license.
+(Note, this means that if you distribute a modified file,
+the modified file must also be provided under this license).
+
+
+
+
+ Unit definition (with respect to SI base units) and default display units
+
+
+
+
+ BaseUnit_value = factor*Unit_value + offset
+
+
+
+
+ Exponent of SI base unit "kg"
+
+
+
+
+ Exponent of SI base unit "m"
+
+
+
+
+ Exponent of SI base unit "s"
+
+
+
+
+ Exponent of SI base unit "A"
+
+
+
+
+ Exponent of SI base unit "K"
+
+
+
+
+ Exponent of SI base unit "mol"
+
+
+
+
+ Exponent of SI base unit "cd"
+
+
+
+
+ Exponent of SI derived unit "rad"
+
+
+
+
+
+
+
+
+
+ DisplayUnit_value = factor*Unit_value + offset
+
+
+
+
+ Name of DisplayUnit element, e.g. , . "name" must be unique with respect to all other "names" of the DisplayUnit definitions of the same Unit (different Unit elements may have the same DisplayUnit names).
+
+
+
+
+
+
+
+
+
+
+ Name of Unit element, e.g. "N.m", "Nm", "%/s". "name" must be unique will respect to all other elements of the UnitDefinitions list. The variable values of fmi2SetXXX and fmi2GetXXX are with respect to this unit.
+
+
+
+