Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

  - All Specs and Factories implemented
  - Fixing More Typos in dir/file names and incorrect module names; long live copy and paste

30 files changed, 167 insertions, 31 deletions

diff --git a/spec/factories/compliance_controls/generic_factories.rb b/spec/factories/compliance_controls/generic_factories.rb
index 175331a3a..bfdfc8f09 100644
--- a/spec/factories/compliance_controls/generic_factories.rb
+++ b/spec/factories/compliance_controls/generic_factories.rb
@@ -1,6 +1,6 @@
 
 FactoryGirl.define do
-  factory :compliance_control do
+  factory :generic_attribute_control_compliance_control do
     sequence(:name) { |n| "Compliance control #{n}" }
     type "GenericAttributeControl::MinMax"
     criticity :warning
@@ -11,19 +11,19 @@ FactoryGirl.define do
     association :compliance_control_block
   end
 
-  factory :min_max, class: 'GenericAttributeControl::MinMax' do
+  factory :generic_attribute_control_min_max, class: 'GenericAttributeControl::MinMax' do
     sequence(:name) { |n| "MinMax control #{n}" }
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :pattern, class: 'GenericAttributeControl::Pattern' do
+  factory :generic_attribute_control_pattern, class: 'GenericAttributeControl::Pattern' do
     sequence(:name) { |n| "Pattern control #{n}" }
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :uniqueness, class: 'GenericAttributeControl::Uniqueness' do
+  factory :generic_attribute_control_uniqueness, class: 'GenericAttributeControl::Uniqueness' do
     sequence(:name) { |n| "Uniqueness control #{n}" }
     association :compliance_control_set
     association :compliance_control_block
diff --git a/spec/factories/compliance_controls/journey_pattern_control_factories.rb b/spec/factories/compliance_controls/journey_pattern_control_factories.rb
index 55f171ae7..f5d1e76e0 100644
--- a/spec/factories/compliance_controls/journey_pattern_control_factories.rb
+++ b/spec/factories/compliance_controls/journey_pattern_control_factories.rb
@@ -1,6 +1,14 @@
 
 FactoryGirl.define do
 
-  factory :journey_pattern_control_duplicates, class: 'JourneyPatternControl::Duplicates'
+  factory :journey_pattern_control_duplicates, class: 'JourneyPatternControl::Duplicates' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :journey_pattern_control_vehicle_journey, class: 'JourneyPatternControl::VehicleJourney' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
 
 end
diff --git a/spec/factories/compliance_controls/line_control_factories.rb b/spec/factories/compliance_controls/line_control_factories.rb
new file mode 100644
index 000000000..3f5422e8c
--- /dev/null
+++ b/spec/factories/compliance_controls/line_control_factories.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :line_control_route, class: 'LineControl::Route' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+end
diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
new file mode 100644
index 000000000..cca36f22f
--- /dev/null
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -0,0 +1,57 @@
+FactoryGirl.define do
+
+  factory :route_control_journey_pattern, class: 'RouteControl::JourneyPattern' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_minimum_length, class: 'RouteControl::MinimumLength' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_omnibus_journey_pattern, class: 'RouteControl::OmnibusJourneyPattern' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_opposite_route, class: 'RouteControl::OppositeRoute' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_opposite_route_terminus, class: 'RouteControl::OppositeRouteTerminus' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_stop_point_in_journey_pattern, class: 'RouteControl::StopPointInJourneyPattern' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_unactivated_stop_points, class: 'RouteControl::UnactivatedStopPoints' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_zdl_stop_area, class: 'RouteControl::ZdlStopArea' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_control_speed, class: 'RouteControl::ControlSpeed' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_control_time_table, class: 'RouteControl::ControlTimeTable' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :route_control_control_vehicle_journey_at_stops, class: 'RouteControl::ControlVehicleJourneyAtStops' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+end
diff --git a/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
new file mode 100644
index 000000000..8855a9d58
--- /dev/null
+++ b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
@@ -0,0 +1,17 @@
+FactoryGirl.define do
+  factory :routing_constraint_zone_control_unactivated_stop_point,
+    class: 'routingConstraintZoneControl::UnactivatedStopPoint' do
+      association :compliance_control_set
+      association :compliance_control_block
+  end
+
+  factory :routing_constraint_zone_control_minimum_length, class: 'routingConstraintZoneControl::MinimumLength' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :routing_constraint_zone_control_maximum_length, class: 'routingConstraintZoneControl::MaximumLength' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+end
diff --git a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
new file mode 100644
index 000000000..dce4f25cc
--- /dev/null
+++ b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+
+  factory :vehicle_journey_control_wating_time, class: 'vehicleJourneyControl::WatingTime' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
+  factory :vehicle_journey_control_delta, class: 'vehicleJourneyControl::Delta' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+end
diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
index 643f65f30..850cd1d76 100644
--- a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe GenericAttributeControl::Pattern, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Generic-3" }
   let( :factory ){ :generic_attribute_control_pattern }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb
index fac405285..e4ab8d2cd 100644
--- a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe GenericAttributeControl::Uniqueness, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Generic-3" }
   let( :factory ){ :generic_attribute_control_uniqueness }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb
index 46210354e..89544937b 100644
--- a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe JourneyPatternControl::Duplicates, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-JourneyPattern-1" }
   let( :factory ){ :journey_pattern_control_duplicates }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb
index 52ac8af8f..fb254ee31 100644
--- a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe JourneyPatternControl::VehicleJourney, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-JourneyPattern-2" }
   let( :factory ){ :journey_pattern_control_vehicle_journey }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb
index 61e4ed762..ab5fb1027 100644
--- a/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe LineControl::Route, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Line-1" }
   let( :factory ){ :line_control_route }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb
index 25607c5d4..46531cc3b 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::Duplicates, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-4" }
   let( :factory ){ :route_control_duplicates }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb
index 4f87c866a..2bdd6e591 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::JourneyPattern, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-3" }
   let( :factory ){ :route_control_journey_pattern }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb
index ecf8d9fee..85bab4ac6 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::MinimumLength, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-6" }
   let( :factory ){ :route_control_minimum_length }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb
index 3837190fa..3fb782e85 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::OmnibusJourneyPattern, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-9" }
   let( :factory ){ :route_control_omnibus_journey_pattern }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb
index c72195fe2..7013ae269 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::OppositeRoute, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-2" }
   let( :factory ){ :route_control_opposite_route }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb
index 6cc96cd60..a3a8d290d 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::OppositeRouteTerminus, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-5" }
   let( :factory ){ :route_control_opposite_route_terminus }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
index d8be035a2..7e6a21209 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
@@ -1,7 +1,7 @@
 
-RSpec.describe VehicleJourneyControl::Speed, type: :model do
-  let( :default_code ){ "3-Generic-2" }
-  let( :factory ){ :vehicle_journey_control_speed }
+RSpec.describe RouteControl::Speed, type: :model do
+  let( :default_code ){ "3-VehicleJourney-2" }
+  let( :factory ){ route_control_control_speed }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
index ce54b27ac..17af1c8e5 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
@@ -1,6 +1,6 @@
 
-RSpec.describe RouteControl::StopPointInJourneyPattern, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+RSpec.describe RouteControl::StopPointsInJourneyPattern, type: :model do
+  let( :default_code ){ "3-Route-6" }
   let( :factory ){ :route_control_stop_point_in_journey_pattern }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
index 7f37d15b1..63b45c04a 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
@@ -1,7 +1,7 @@
 
-RSpec.describe VehicleJourneyControl::TimeTable, type: :model do
-  let( :default_code ){ "3-Generic-2" }
-  let( :factory ){ :vehicle_journey_control_time_table }
+RSpec.describe RouteControl::TimeTable, type: :model do
+  let( :default_code ){ "3-VehicleJourney-4" }
+  let( :factory ){ route_control_control_time_table }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
index 586f92d62..bf725d743 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
@@ -1,7 +1,7 @@
 
-RSpec.describe RouteControl::UnactivatedStopPoint, type: :model do
-  let( :default_code ){ "3-Generic-2" }
-  let( :factory ){ :route_control_unactivated_stop_point }
+RSpec.describe RouteControl::UnactivatedStopPoints, type: :model do
+  let( :default_code ){ "3-Route-10" }
+  let( :factory ){ :route_control_unactivated_stop_points }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
index d442fd365..c563446a6 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
@@ -1,7 +1,7 @@
 
-RSpec.describe VehicleJourneyControl::VehicleJourneyAtStops, type: :model do
-  let( :default_code ){ "3-Generic-2" }
-  let( :factory ){ :vehicle_journey_control_vehicle_journey_at_stops }
+RSpec.describe RouteControl::VehicleJourneyAtStops, type: :model do
+  let( :default_code ){ "3-VehicleJourney-5" }
+  let( :factory ){ route_control_control_vehicle_journey_at_stops }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb
index 6101c29ff..2b8a11bd1 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb
@@ -1,6 +1,6 @@
 
 RSpec.describe RouteControl::ZDLStopArea, type: :model do
-  let( :default_code ){ "3-Generic-2" }
+  let( :default_code ){ "3-Route-1" }
   let( :factory ){ :route_control_zdl_stop_area }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
index e69de29bb..61896ef5e 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe RoutingConstraintZoneControl::MaximumLength, type: :model do
+  let( :default_code ){ "3-ITL-2" }
+  let( :factory ){ :routing_constraint_zone_control_maximum_length }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
index e69de29bb..e930c2475 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe RoutingConstraintZoneControl::MinimumLength, type: :model do
+  let( :default_code ){ "3-ITL-3" }
+  let( :factory ){ :routing_constraint_zone_control_minimum_length }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
index e69de29bb..aba9b7fc1 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe RoutingConstraintZoneControl::UnactivatedStopPoint, type: :model do
+  let( :default_code ){ "3-ITL-1" }
+  let( :factory ){ :routing_constraint_zone_control_unactivated_stop_point }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb
deleted file mode 100644
index e69de29bb..000000000
--- a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb
+++ /dev/null
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccld_spec.rb
new file mode 100644
index 000000000..0d4bce7ca
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe VehicleJourneyControl::Delta, type: :model do
+  let( :default_code ){ "3-VehicleJourney-3" }
+  let( :factory ){ :vehicle_journey_control_delta }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb
deleted file mode 100644
index e69de29bb..000000000
--- a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb
+++ /dev/null
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb
new file mode 100644
index 000000000..584a8fb1b
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe VehicleJourneyControl::WatingTime, type: :model do
+  let( :default_code ){ "3-VehicleJourney-1" }
+  let( :factory ){ :vehicle_journey_control_wating_time }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults' 
+end