diff --git a/tests/tests.csv b/tests/tests.csv
index 07b40ae0eb6784a73db174857d3577fa0ceb9cd2..1da1071ddec2b4c08919f80b7fa61893e759bbc4 100644
--- a/tests/tests.csv
+++ b/tests/tests.csv
@@ -4,7 +4,7 @@ LIFT-TEST-2;LIFT-2;Car Signal;MovingUpwardDirection subClassOf CarSignal, Moving
 LIFT-TEST-3;LIFT-3;Car Signal;MovingDownwardDirection subClassOf CarSignal, MovingDownwardDirection subclassOf hasValue some boolean
 LIFT-TEST-4;LIFT-4;Car Signal;CarInUnlockingZone subClassOf CarSignal, CarInUnlockingZone subclassOf hasValue some boolean
 LIFT-TEST-5;LIFT-5;Car Signal;TestRide subClassOf CarSignal, TestRide subclassOf hasValue some boolean
-LIFT-TEST-6;LIFT-6;Car Signal;Fault subClassOf FaultSignal
+LIFT-TEST-6;LIFT-6;Car Signal;FaultSignal type Class
 LIFT-TEST-7;LIFT-7;Car Signal;OutOfService subClassOf CarSignal, OutOfService subclassOf hasValue some boolean
 LIFT-TEST-8;LIFT-8;Car Signal;OutOfService subClassOf CarSignal, OutOfService subclassOf hasValue some boolean
 LIFT-TEST-9;LIFT-9;Car Signal;Overload subClassOf CarSignal, Overload subclassOf hasValue some boolean
@@ -15,7 +15,7 @@ LIFT-TEST-13;LIFT-13;Car Signal;CarEmpty subClassOf CarSignal, CarEmpty subclass
 LIFT-TEST-14;LIFT-14;Car Signal;SmartLiftInstallation hasLimitLoad Load
 LIFT-TEST-15;LIFT-15;Car Signal;SmartLiftInstallation hasPowerSupply Power
 LIFT-TEST-16;LIFT-16;Car Signal;SmartLiftInstallation hasStandardPowerSupply Power
-LIFT-TEST-17;LIFT-17;Car Signal;SmartLiftInstallation subClassOf hasCarStops some integer
+LIFT-TEST-17;LIFT-17;Car Signal;SmartLiftInstallation subClassOf hasCarStops only integer
 LIFT-TEST-18;LIFT-18;Car Signal;SmartLiftInstallation subClassOf hasDoorsStatus some boolean
 LIFT-TEST-19;LIFT-19;Bidirectional Communication System Signal;TimeOfLastPeriodicTest72hAttempt subClassOf BCSSignal;TimeOfLastPeriodicTest72hAttempt hasValue Time
 LIFT-TEST-20;LIFT-20;Bidirectional Communication System Signal;SmartLiftInstallation receives BCSSignal
@@ -24,7 +24,7 @@ LIFT-TEST-22;LIFT-22;Bidirectional Communication System Signal;RegisteredNetwork
 LIFT-TEST-23;LIFT-23;Bidirectional Communication System Signal;TimeOfLastPeriodicTest72hAttempt subclassOf BCSSignal , timeOfConfirmationOfLastPeriodicTest72hAttempt subclassOf BCSSignal,registeredNetworkOperator subclassOf BCSSignal, networkQualityRSSI subclassOf BCSSignal, networkQualityBER subclassOf BCSSignal
 LIFT-TEST-24;LIFT-24;Bidirectional Communication System Signal;NetworkFixedLine type Network, Network2G type Network, Network3G type Network, Network4G type Network, Network5G type Network
 LIFT-TEST-25;LIFT-25;Bidirectional Communication System Signal;SmartLiftInstallation subClassOf hasTelephoneNumber some string
-LIFT-TEST-26;LIFT-26;Bidirectional Communication System Signal;SmartLiftInstallation subClassOf hasSecondaryEmergencyTelephoneNumber some string 
+LIFT-TEST-26;LIFT-26;Bidirectional Communication System Signal;SmartLiftInstallation subClassOf hasSecondaryEmergencyTelephoneNumber only string 
 LIFT-TEST-27;LIFT-27;Power Supply Signal;EmergencyPowerSupplySignal subClassOf Signal, EmergencyPowerSupplySignal subclassOf hasValue some boolean
 LIFT-TEST-28;LIFT-28;Power Supply Signal;StandardEmergencyPowerSupplySignal subClassOf Signal, StandardEmergencyPowerSupplySignal subclassOf hasValue some boolean
 LIFT-TEST-29;LIFT-29;Power Supply Signal;SmartLiftInstallation hasPowerSupply Power
@@ -32,9 +32,9 @@ LIFT-TEST-30;LIFT-30;Power Supply Signal;OutOfService subclassOf CarSignal, OutO
 LIFT-TEST-31;LIFT-31;Power Supply Signal;Overload subClassOf CarSignal, Overload subclassOf hasValue some boolean
 LIFT-TEST-32;LIFT-32;Power Supply Signal;InspectionOperation subClassOf Signal, InspectionOperation subclassOf hasValue some boolean
 LIFT-TEST-33;LIFT-33;Power Supply Signal;FireOperation subClassOf CarSignal, FireOperation subclassOf hasValue some boolean
-LIFT-TEST-34;LIFT-34;Fault Signal;DangerousFault subclassof Fault
-LIFT-TEST-35;LIFT-35;Fault Signal;MinorFault subclassof Fault
-LIFT-TEST-36;LIFT-36;Fault Signal;AudioFault subclassOf Fault
+LIFT-TEST-34;LIFT-34;Fault Signal;DangerousFault subclassof FaultSignal
+LIFT-TEST-35;LIFT-35;Fault Signal;MinorFault subclassof FaultSignal
+LIFT-TEST-36;LIFT-36;Fault Signal;AudioFault subclassOf FaultSignal
 LIFT-TEST-37;LIFT-37;Statistic Signal;NumberOfCalls subClassOf StatisticSignal, NumberOfCalls subclassOf hasValue some integer
 LIFT-TEST-38;LIFT-38;Statistic Signal;UpwardTravels subClassOf StatisticSignal, UpwardTravels subclassOf hasValue some integer
 LIFT-TEST-39;LIFT-39;Statistic Signal;DownwardTravels subClassOf StatisticSignal, DownwardTravels subclassOf hasValue some integer
@@ -60,21 +60,21 @@ LIFT-TEST-58;LIFT-58;Command;SetOutOfService subclassOf Command
 LIFT-TEST-59;LIFT-59;Command;TestEmergencyNumber subclassOf Command
 LIFT-TEST-60;LIFT-60;Command;TestRide subclassOf Command
 LIFT-TEST-61;LIFT-61;Command;SetRealTimeMode subclassOf Command
-LIFT-TEST-62;LIFT-62;Command;SmartLift subclassOf hasMainEmergencyTelephoneNumber some string
+LIFT-TEST-62;LIFT-62;Command;SmartLift subclassOf hasMainEmergencyTelephoneNumber only string
 LIFT-TEST-63;LIFT-63;Command;SmartLift hasTravelTime Time
 LIFT-TEST-64;LIFT-64;Command;BoardReset subclassOf Command
-LIFT-TEST-65;LIFT-65;Command;BatteryPower subClassOf hasStatus some string
-LIFT-TEST-66;LIFT-66;Command;SOSBatteryPower subClassOf hasStatus some string
+LIFT-TEST-65;LIFT-65;Command;BatteryPower subClassOf hasStatus only string
+LIFT-TEST-66;LIFT-66;Command;SOSBatteryPower subClassOf hasStatus only string
 LIFT-TEST-67;LIFT-67;Smart Lift System;SmartLiftInstallation hasSubsystem SmartLiftInstallation
 LIFT-TEST-68;LIFT-68;Smart Lift System;SmartLiftInstallation hasSubsystem SmartLiftEdgeControlUnit 
 LIFT-TEST-69;LIFT-69;Smart Lift System;Signal subClassOf SmartLiftmodule, BidirectionalCommunicationSystem subClassOf SmartLiftmodule
 LIFT-TEST-70;LIFT-70;Smart Lift identification;SmartLiftInstallation type Class
 LIFT-TEST-71;LIFT-71;Smart Lift identification;SmartLiftsGroup type Class
-LIFT-TEST-72;LIFT-72;Smart Lift identification;SmartLiftInstallation subClassOf hasManufacturer some string
-LIFT-TEST-73;LIFT-73;Smart Lift identification;SmartLiftInstallation subClassOf hasInstallerLiftCompany some string
-LIFT-TEST-74;LIFT-74;Smart Lift administrative information;SmartLiftInstallation hasMaintenanceCompany subClassOf some string
-LIFT-TEST-75;LIFT-75;Smart Lift administrative information;SmartLiftInstallation subClassOf hasBuildingManager some string
-LIFT-TEST-76;LIFT-76;Smart Lift administrative information;SmartLiftInstallation subClassOf hasOwner some string
+LIFT-TEST-72;LIFT-72;Smart Lift identification;SmartLiftInstallation subClassOf hasManufacturer only string
+LIFT-TEST-73;LIFT-73;Smart Lift identification;SmartLiftInstallation subClassOf hasInstallerLiftCompany only string
+LIFT-TEST-74;LIFT-74;Smart Lift administrative information;SmartLiftInstallation subClassOf hasMaintenanceCompany only string
+LIFT-TEST-75;LIFT-75;Smart Lift administrative information;SmartLiftInstallation subClassOf hasBuildingManager only string
+LIFT-TEST-76;LIFT-76;Smart Lift administrative information;SmartLiftInstallation subClassOf hasOwner only string
 LIFT-TEST-77;LIFT-77;Smart Lift administrative information;SmartLiftInstallation hasGeometry Point
-LIFT-TEST-78;LIFT-78;Smart Lift administrative information;SmartLiftInstallation subclassOf hasLocationValidator some string
+LIFT-TEST-78;LIFT-78;Smart Lift administrative information;SmartLiftInstallation subclassOf hasLocationValidator only string
 LIFT-TEST-79;LIFT-79;Smart Lift administrative information;GoodsLift subClassOf SmartLiftInstallation, GoodsOnlyLift subClassOf SmartLiftInstallation, FiremanLift subClassOf SmartLiftInstallation