Fluid level test bug fixed

@@ -10,11 +10,11 @@
 
 <http://www.reportinghub.no/ep/schema/1.0/organization>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 ep-org:CateringCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "catering crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
@@ -29,7 +29,7 @@ ep-org:Company
       rdfs:subClassOf ep-org:Organization-WholeLife .
 
 ep-org:ContractorCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "contractor crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
@@ -44,39 +44,39 @@ ep-org:CrewType
       rdfs:subClassOf owl:Class .
 
 ep-org:DayVisitorCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "day visitor crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:DrillingContractCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "drilling contract crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:NonOperatorOvernightVisitorCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "non-operator overnight visitor crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:OperatorNormalCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "operator normal crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:OperatorOvernightVisitorCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "operator overnight visitor crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:Organization
       rdf:type owl:Class ;
       rdfs:label "organization"^^xsd:string ;
-      rdfs:subClassOf ep-org:PersonOrOrganization , <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> , ep-org:PersonOrOrganization .
 
 ep-org:Organization-WholeLife
       rdf:type owl:Class ;
       rdfs:label "organization - whole life"^^xsd:string ;
-      rdfs:subClassOf ep-org:Organization .
+      rdfs:subClassOf ep-org:PersonOrOrganization-WholeLife , ep-org:Organization .
 
 ep-org:Person
       rdf:type owl:Class ;
@@ -86,6 +86,10 @@ ep-org:PersonOrOrganization
       rdf:type owl:Class ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
 
+ep-org:PersonOrOrganization-WholeLife
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-org:PersonOrOrganization .
+
 ep-org:PersonRole
       rdf:type owl:Class ;
       rdfs:label "person role"^^xsd:string ;
@@ -97,14 +101,14 @@ ep-org:PersonRoleType
       rdfs:subClassOf owl:Class .
 
 ep-org:TotalCrew
-      rdf:type owl:Class , ep-org:CrewType ;
+      rdf:type ep-org:CrewType , owl:Class ;
       rdfs:label "total crew"^^xsd:string ;
       rdfs:subClassOf ep-org:Crew .
 
 ep-org:WholeLifePerson
       rdf:type owl:Class ;
       rdfs:label "whole life person"^^xsd:string ;
-      rdfs:subClassOf ep-org:Person .
+      rdfs:subClassOf ep-org:PersonOrOrganization-WholeLife , ep-org:Person .
 
 ep-org:hasCrew
       rdf:type owl:ObjectProperty ;
@@ -113,7 +117,7 @@ ep-org:hasCrew
       rdfs:range ep-org:Crew .
 
 ep-org:numberInCrew
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:domain ep-org:Crew ;
       rdfs:label "number in crew"^^xsd:string .