diff --git a/tests/tests.csv b/tests/tests.csv
index d53c0b7a6ca7b50f037a383189a9e6e98cf05a02..c8981c7c10ecb2695e3835702d72876fb9304287 100644
--- a/tests/tests.csv
+++ b/tests/tests.csv
@@ -1,49 +1,49 @@
 Id;Requirement;Category;Test
-LIFT-TEST-1;LIFT-1;Car Signal;CurrentCarStop type CarSignal, CurrentCarStop subclassOf hasValue some integer
-LIFT-TEST-2;LIFT-2;Car Signal;MovingUpwardDirection type CarSignal, MovingUpwardDirection subclassOf hasValue some boolean
-LIFT-TEST-3;LIFT-3;Car Signal;MovingDownwardDirection type CarSignal, MovingDownwardDirection subclassOf hasValue some boolean
-LIFT-TEST-4;LIFT-4;Car Signal;CarInUnlockingZone type CarSignal, CarInUnlockingZone subclassOf hasValue some boolean
-LIFT-TEST-5;LIFT-5;Car Signal;TestRide type CarSignal, TestRide subclassOf hasValue some boolean
-LIFT-TEST-6;LIFT-6;Car Signal;Fault type FaultSignal
-LIFT-TEST-7;LIFT-7;Car Signal;OutOfService type CarSignal, OutOfService subclassOf hasValue some boolean
-LIFT-TEST-8;LIFT-8;Car Signal;OutOfService type CarSignal, OutOfService subclassOf hasValue some boolean
-LIFT-TEST-9;LIFT-9;Car Signal;Overload type CarSignal, Overload subclassOf hasValue some boolean
-LIFT-TEST-10;LIFT-10;Car Signal;InspectionOperation type CarSignal, InspectionOperation subclassOf hasValue some boolean
-LIFT-TEST-11;LIFT-11;Car Signal;FireOperation type CarSignal, FireOperation subclassOf hasValue some boolean
-LIFT-TEST-12;LIFT-12;Car Signal;CarAlarm type CarSignal, CarAlarm subclassOf hasValue some boolean
-LIFT-TEST-13;LIFT-13;Car Signal;CarEmpty type CarSignal, CarEmpty subclassOf hasValue some boolean
-LIFT-TEST-14;LIFT-14;Car Signal;SmartLiftSystem hasLimitLoad  Load
-LIFT-TEST-15;LIFT-15;Car Signal;SmartLiftSystem hasPowerSupply  PowerSupply
-LIFT-TEST-16;LIFT-16;Car Signal;SmartLiftSystem  hasStandardPowerSupply  PowerSupply
-LIFT-TEST-17;LIFT-17;Car Signal;SmartLiftSystem subClassOf hasCarStops some integer
-LIFT-TEST-18;LIFT-18;Car Signal;SmartLiftSystem subClassOf hasDoorsStatus some string
-LIFT-TEST-19;LIFT-19;Bidirectional Communication System Signal;"TimeOfLastPeriodicTest72hAttempt type BCSSignal; TimeOfLastPeriodicTest72hAttempt hasValue Time"
-LIFT-TEST-20;LIFT-20;Bidirectional Communication System Signal;SmartLiftSystem receives  BCSSignal
-LIFT-TEST-21;LIFT-21;Bidirectional Communication System Signal;NetworkCoverage isMeasuredIn percentage
-LIFT-TEST-22;LIFT-22;Bidirectional Communication System Signal;registeredNetworkOperator type BCSSignal, registeredNetworkOperator subclassOf hasValue some string
-LIFT-TEST-23;LIFT-23;Bidirectional Communication System Signal;TimeOfLastPeriodicTest72hAttempt type BCSSignal , timeOfConfirmationOfLastPeriodicTest72hAttempt type BCSSignal,registeredNetworkOperator type BCSSignal, networkQualityRSSI type BCSSignal, networkQualityBER type BCSSignal
-LIFT-TEST-24;LIFT-24;Bidirectional Communication System Signal;Fixed_Line type Network, 2G type Network, 3G type Network, 4G type Network, 5G type Network
-LIFT-TEST-25;LIFT-25;Bidirectional Communication System Signal;SmartLiftSystem subClassOf hasTelephoneNumber some string
-LIFT-TEST-26;LIFT-26;Bidirectional Communication System Signal;SmartLift subClassOf hasSecondaryEmergencyTelephoneNumber some string 
-LIFT-TEST-27;LIFT-27;Power Supply Signal;EmergencyPowerSupply type Signal,  EmergencyPowerSupply subclassOf hasValue some boolean
-LIFT-TEST-28;LIFT-28;Power Supply Signal;StandardEmergencyPowerSupply type Signal,  StandardEmergencyPowerSupply subclassOf hasValue some boolean
-LIFT-TEST-29;LIFT-29;Power Supply Signal;SmartLiftSystem  hasPowerSupply some Power
-LIFT-TEST-30;LIFT-30;Power Supply Signal;OutOfService type CarSignal, OutOfService subclassOf hasValue some boolean
-LIFT-TEST-31;LIFT-31;Power Supply Signal;Overload type CarSignal, Overload subclassOf hasValue some boolean
-LIFT-TEST-32;LIFT-32;Power Supply Signal;InspectionOperation type Signal, InspectionOperation subclassOf hasValue some boolean
-LIFT-TEST-33;LIFT-33;Power Supply Signal;FireOperation type CarSignal, FireOperation subclassOf hasValue some boolean
+LIFT-TEST-1;LIFT-1;Car Signal;CurrentCarStop subClassOf CarSignal, CurrentCarStop subclassOf hasValue some integer
+LIFT-TEST-2;LIFT-2;Car Signal;MovingUpwardDirection subClassOf CarSignal, MovingUpwardDirection subclassOf hasValue some boolean
+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-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
+LIFT-TEST-10;LIFT-10;Car Signal;InspectionOperation subClassOf CarSignal, InspectionOperation subclassOf hasValue some boolean
+LIFT-TEST-11;LIFT-11;Car Signal;FireOperation subClassOf CarSignal, FireOperation subclassOf hasValue some boolean
+LIFT-TEST-12;LIFT-12;Car Signal;CarAlarm subClassOf CarSignal, CarAlarm subclassOf hasValue some boolean
+LIFT-TEST-13;LIFT-13;Car Signal;CarEmpty subClassOf CarSignal, CarEmpty subclassOf hasValue some boolean
+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-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
+LIFT-TEST-21;LIFT-21;Bidirectional Communication System Signal;NetworkCoverage isMeasuredIn UnitOfMeasure
+LIFT-TEST-22;LIFT-22;Bidirectional Communication System Signal;RegisteredNetworkOperator subclassOf BCSSignal, RegisteredNetworkOperator subclassOf hasValue some string
+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-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
+LIFT-TEST-30;LIFT-30;Power Supply Signal;OutOfService subclassOf CarSignal, OutOfService subclassOf hasValue some boolean
+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-37;LIFT-37;Statistic Signal;numberOfCalls type StatisticSignal, numberOfCalls subclassOf hasValue some integer
-LIFT-TEST-38;LIFT-38;Statistic Signal;upwardTravels type StatisticSignal, upwardTravels subclassOf hasValue some integer
-LIFT-TEST-39;LIFT-39;Statistic Signal;downwardTravels type StatisticSignal, downwardTravels subclassOf hasValue some integer
-LIFT-TEST-40;LIFT-40;Statistic Signal;totalFloorsCovered type StatisticSignal, totalFloorsCovered subclassOf hasValue some integer
-LIFT-TEST-41;LIFT-41;Statistic Signal;totalResetSequence type StatisticSignal, totalResetSequence subclassOf hasValue some integer
-LIFT-TEST-42;LIFT-42;Statistic Signal;totalReversalDirection type StatisticSignal, totalReversalDirection subclassOf hasValue some integer
-LIFT-TEST-43;LIFT-43;Statistic Signal;totalTimesOpened type StatisticSignal, totalTimesOpened subclassOf hasValue some integer
-LIFT-TEST-44;LIFT-44;Statistic Signal;callsPerService type StatisticSignal, callsPerService subclassOf hasValue some integer
-LIFT-TEST-45;LIFT-45;Statistic Signal;numberOfFaults type StatisticSignal, numberOfFaults subclassOf hasValue some integer
+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
+LIFT-TEST-40;LIFT-40;Statistic Signal;TotalFloorsCovered subClassOf StatisticSignal, totalFloorsCovered subclassOf hasValue some integer
+LIFT-TEST-41;LIFT-41;Statistic Signal;TotalResetSequence subClassOf StatisticSignal, totalResetSequence subclassOf hasValue some integer
+LIFT-TEST-42;LIFT-42;Statistic Signal;TotalReversalDirection subClassOf StatisticSignal, TotalReversalDirection subclassOf hasValue some integer
+LIFT-TEST-43;LIFT-43;Statistic Signal;TotalTimesOpened type StatisticSignal, TotalTimesOpened subclassOf hasValue some integer
+LIFT-TEST-44;LIFT-44;Statistic Signal;CallsPerService type StatisticSignal, CallsPerService subclassOf hasValue some integer
+LIFT-TEST-45;LIFT-45;Statistic Signal;NumberOfFaults type StatisticSignal, NumberOfFaults subclassOf hasValue some integer
 LIFT-TEST-46;LIFT-46;Alarm;AlarmInTheCar subclassOf Alarm, CarAlarm subclassOf hasValue some boolean
 LIFT-TEST-47;LIFT-47;Alarm;AlarmInTheCar subclassOf Alarm, CarAlarm subclassOf hasValue some boolean
 LIFT-TEST-48;LIFT-48;Alarm;AlarmVoiceCommunication subclassOf Alarm 
@@ -51,30 +51,30 @@ LIFT-TEST-49;LIFT-49;Alarm;AlarmInTheWell subclassOf Alarm
 LIFT-TEST-50;LIFT-50;Alarm;AlarmInTheMachinery subclassOf Alarm
 LIFT-TEST-51;LIFT-51;Alarm;FloodAlarm subclassOf Alarm
 LIFT-TEST-52;LIFT-52;Alarm;EmergencyPowerAlarm subclassOf Alarm
-LIFT-TEST-53;LIFT-53;Command;SmartLiftSystem sends  Command
-LIFT-TEST-54;LIFT-54;Command; callCarToSpecificFloor type Command
-LIFT-TEST-55;LIFT-55;Command;sendCarToSpecificService type Command
-LIFT-TEST-56;LIFT-56;Command;SmartLift  hasDoorOpenTime Time
-LIFT-TEST-57;LIFT-57;Command;SmartLift  hasDoorCloseTime Time
-LIFT-TEST-58;LIFT-58;Command;setOutOfService type Command
-LIFT-TEST-59;LIFT-59;Command;testEmergencyNumber type Command
-LIFT-TEST-60;LIFT-60;Command;testRide type Command
-LIFT-TEST-61;LIFT-61;Command;setRealTimeMode type Command
-LIFT-TEST-62;LIFT-62;Command;SmartLift  subclassOf hasMainEmergencyTelephoneNumber some string
-LIFT-TEST-63;LIFT-63;Command;SmartLift  hasTravelTime Time
-LIFT-TEST-64;LIFT-64;Command;boardReset type 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-67;LIFT-67;Smart Lift System;SmartLiftInstallation isContainedInto SmartLiftSystem
-LIFT-TEST-68;LIFT-68;Smart Lift System;SmartLiftEdgeControlUnit hosts SmartLiftmodule 
-LIFT-TEST-69;LIFT-69;Smart Lift System; Signal subClassOf SmartLiftmodule, BidirectionalCommunicationSystem subClassOf SmartLiftmodule
+LIFT-TEST-53;LIFT-53;Command;Function hasCommand Command
+LIFT-TEST-54;LIFT-54;Command;CallCarToSpecificFloor subclassOf Command
+LIFT-TEST-55;LIFT-55;Command;SendCarToSpecificService subclassOf Command
+LIFT-TEST-56;LIFT-56;Command;SmartLiftInstallation hasDoorOpenTime Time
+LIFT-TEST-57;LIFT-57;Command;SmartLiftInstallation hasDoorCloseTime Time
+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-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-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;SmartLiftSystem hasManufacturingCompany Organisation
-LIFT-TEST-73;LIFT-73;Smart Lift identification;SmartLiftSystem hasInstallerCompany Organisation
-LIFT-TEST-74;LIFT-74;Smart Lift administrative information;SmartLiftSystem hasMaintenanceCompany Organisation
-LIFT-TEST-75;LIFT-75;Smart Lift administrative information;SmartLiftSystem  hasBuildingManager  Person
-LIFT-TEST-76;LIFT-76;Smart Lift administrative information;SmartLiftSystem  hasOwner  Person
-LIFT-TEST-77;LIFT-77;Smart Lift administrative information;SmartLiftSystem  isLocatedIn Point
-LIFT-TEST-78;LIFT-78;Smart Lift administrative information;Point  isProvidedBy Person 
-LIFT-TEST-79;LIFT-79;Smart Lift administrative information; GoodsLift subClassOf SmartLiftSystem,  GoodsOnlyLift subClassOf SmartLiftSystem,  FiremanLift subClassOf SmartLiftSystem
+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-77;LIFT-77;Smart Lift administrative information;SmartLiftInstallation hasGeometry Point
+LIFT-TEST-78;LIFT-78;Smart Lift administrative information;Point isProvidedBy Person 
+LIFT-TEST-79;LIFT-79;Smart Lift administrative information;GoodsLift subClassOf SmartLiftInstallation, GoodsOnlyLift subClassOf SmartLiftInstallation, FiremanLift subClassOf SmartLiftInstallation