2 files changed, 11 insertions, 12 deletions

diff --git a/src/test/scala/rsacomb/CanonicalModelSpec.scala b/src/test/scala/rsacomb/CanonicalModelSpec.scala
index ef27a4f..cac40a3 100644
--- a/src/test/scala/rsacomb/CanonicalModelSpec.scala
+++ b/src/test/scala/rsacomb/CanonicalModelSpec.scala
@@ -23,7 +23,7 @@ object Ontology1_CanonicalModelSpec {
   val renderer = new DLSyntaxObjectRenderer()
 
   val ontology_path: File = new File("examples/example1.ttl")
-  val ontology: RSAOntology = RSA.loadOntology(ontology_path)
+  val ontology = RSAOntology(ontology_path)
   val program = ontology.canonicalModel
 
   val roleR = new OWLObjectPropertyImpl(RSA.base("R"))
@@ -87,7 +87,7 @@ class Ontology1_CanonicalModelSpec
 
   renderer.render(AsubClassOfD) should "be converted into a single Rule" in {
     val varX = Variable.create("X")
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = AsubClassOfD.accept(visitor)
     rules.loneElement shouldBe a[Rule]
   }
@@ -152,7 +152,7 @@ class Ontology1_CanonicalModelSpec
     AsomeValuesFromSiC
   ) should "produce 1 rule" in {
     val varX = Variable.create("X")
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = AsomeValuesFromSiC.accept(visitor)
     rules should have length 1
   }
@@ -175,7 +175,7 @@ class Ontology1_CanonicalModelSpec
     // Rule 3 provides 48 rule (split in 2)
     // Then (1*2 + 48) + (0) + (48*2) = 146
     val varX = Variable.create("X")
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = DsomeValuesFromRB.accept(visitor)
     rules should have length 146
   }
@@ -198,7 +198,7 @@ class Ontology1_CanonicalModelSpec
     // Rule 3 provides 32 rule (split in 2)
     // Then (1*2 + 32) + (0) + (32*2) = 98
     val varX = Variable.create("X")
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = DsomeValuesFromRB.accept(visitor)
     rules should have length 146
   }
@@ -207,7 +207,7 @@ class Ontology1_CanonicalModelSpec
     SsubPropertyOfT
   ) should "produce 2 rules" in {
     val varX = Variable.create("X")
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = SsubPropertyOfT.accept(visitor)
     rules should have length 2
   }
@@ -220,7 +220,7 @@ object Ontology2_CanonicalModelSpec {
   val renderer = new DLSyntaxObjectRenderer()
 
   val ontology_path: File = new File("examples/example2.owl")
-  val ontology: RSAOntology = RSA.loadOntology(ontology_path)
+  val ontology = RSAOntology(ontology_path)
   val program = ontology.canonicalModel
 
   val roleR = new OWLObjectPropertyImpl(RSA.base("R"))
@@ -326,7 +326,7 @@ class Ontology2_CanonicalModelSpec
   renderer.render(
     AsomeValuesFromRB
   ) should "produce 1 rule" in {
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = AsomeValuesFromRB.accept(visitor)
     rules should have length 1
   }
@@ -336,7 +336,7 @@ class Ontology2_CanonicalModelSpec
   renderer.render(
     BsomeValuesFromSC
   ) should "produce 1 rule" in {
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = BsomeValuesFromSC.accept(visitor)
     rules should have length 1
   }
@@ -346,7 +346,7 @@ class Ontology2_CanonicalModelSpec
   renderer.render(
     CsomeValuesFromTD
   ) should "produce 1 rule" in {
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = CsomeValuesFromTD.accept(visitor)
     rules should have length 1
   }
@@ -356,7 +356,7 @@ class Ontology2_CanonicalModelSpec
   renderer.render(
     DsomeValuesFromPA
   ) should "produce 1 rule" in {
-    val visitor = program.ProgramGenerator
+    val visitor = program.RuleGenerator
     val rules = DsomeValuesFromPA.accept(visitor)
     rules should have length 1
   }
diff --git a/src/test/scala/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/rsacomb/FilteringProgramSpecs.scala
index 26b0857..79e675f 100644
--- a/src/test/scala/rsacomb/FilteringProgramSpecs.scala
+++ b/src/test/scala/rsacomb/FilteringProgramSpecs.scala
@@ -283,7 +283,6 @@ object FilteringProgramSpec {
 
   val queries =
     List(query0, query1, query2, query3, query4, query5, query6, query7)
-
 }
 
 class FilteringProgramSpec