earth 0.11.20 → 0.12.0

data/spec/earth/automobile/automobile_activity_year_type_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'earth/automobile/automobile_activity_year_type'
+
+describe AutomobileActivityYearType do
+  before :all do
+    Earth.init :automobile, :load_data_miner => true
+    require 'earth/acronyms'
+  end
+  
+  describe 'import', :data_miner => true do
+    it 'should import data' do
+      AAYT.run_data_miner!
+    end
+  end
+  
+  describe 'verify', :sanity => true do
+    it { AAYT.count.should == 30 }
+    it { AAYT.where("hfc_emissions > 0").count.should == AAYT.count }
+    it { AAYT.where("hfc_emission_factor > 0").count.should == AAYT.count }
+    
+    # spot check
+    it { AAYT.first.hfc_emissions.should be_within(0.1).of(31000000000) }
+    it { AAYT.first.hfc_emission_factor.should be_within(1e-5).of(0.02438) }
+    it { AAYT.first.hfc_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
+  end
+  
+  describe '.find_by_type_name_and_closest_year' do
+    it { AAYT.find_by_type_name_and_closest_year('Passenger cars', 2010).should == AAYT.where(:type_name => 'Passenger cars', :activity_year => 2009).first }
+    it { AAYT.find_by_type_name_and_closest_year('Passenger cars', 2005).should == AAYT.where(:type_name => 'Passenger cars', :activity_year => 2005).first }
+    it { AAYT.find_by_type_name_and_closest_year('Passenger cars', 1994).should == AAYT.where(:type_name => 'Passenger cars', :activity_year => 1995).first }
+  end
+  
+  describe '#activity_year_type_fuels' do
+    it 'should match' do
+      AAYT.first.activity_year_type_fuels.should == AAYTF.where(:activity_year => 1995, :type_name => 'Light-duty trucks')
+    end
+  end
+end

data/spec/earth/automobile/automobile_fuel_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 require 'earth/automobile'
 
 describe AutomobileFuel do
+  let(:fallback) { AutomobileFuel.fallback }
+  
   describe 'import', :data_miner => true do
     before do
-      Earth.init :automobile, :load_data_miner => true, :skip_parent_associations => :true
+      Earth.init :automobile, :load_data_miner => true
     end
     
     it 'should import data without problems' do
@@ -13,11 +15,94 @@ describe AutomobileFuel do
   end
   
   describe 'verify imported data', :sanity => true do
-    it 'should have all the data' do
-      AutomobileFuel.count.should == 9
-    end
-    it 'correctly assigns hfc_emission_factor' do
-      AutomobileFuel.first.hfc_emission_factor.should == 0.124799
+    it { AutomobileFuel.count.should == 12 }
+    it { AutomobileFuel.where(:distance_key => nil).count.should == 0 }
+    it { AutomobileFuel.where("annual_distance >= 0").count.should == AutomobileFuel.count }
+    it { AutomobileFuel.where("energy_content >= 0").count.should == AutomobileFuel.count }
+    it { AutomobileFuel.where("co2_emission_factor >= 0").count.should == AutomobileFuel.count - 1 }
+    it { AutomobileFuel.where("co2_biogenic_emission_factor >= 0").count.should == AutomobileFuel.count - 1 }
+    it { AutomobileFuel.where("ch4_emission_factor >= 0").count.should == AutomobileFuel.count }
+    it { AutomobileFuel.where("n2o_emission_factor >= 0").count.should == AutomobileFuel.count }
+    it { AutomobileFuel.where("total_consumption >= 0").count.should == 2 }
+    
+    it { AutomobileFuel.find('gasoline').annual_distance.should be_within(0.1).of(17568.6) }
+    it { AutomobileFuel.find('gasoline').energy_content.should be_within(1e-5).of(34.6272) }
+    it { AutomobileFuel.find('gasoline').co2_emission_factor.should be_within(1e-6).of(2.34183) }
+    it { AutomobileFuel.find('gasoline').ch4_emission_factor.should be_within(1e-8).of(4.2548e-4) }
+    it { AutomobileFuel.find('gasoline').n2o_emission_factor.should be_within(1e-6).of(5.7340e-3) }
+    
+    it { AutomobileFuel.find('gasoline').annual_distance_units.should == 'kilometres' }
+    it { AutomobileFuel.find('gasoline').energy_content_units.should == 'megajoules_per_litre' }
+    it { AutomobileFuel.find('gasoline').co2_emission_factor_units.should == 'kilograms_per_litre' }
+    it { AutomobileFuel.find('gasoline').ch4_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
+    it { AutomobileFuel.find('gasoline').n2o_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
+    
+    it { AutomobileFuel.find('diesel').annual_distance.should be_within(0.1).of(22410.2) }
+    it { AutomobileFuel.find('diesel').energy_content.should be_within(1e-5).of(38.5491) }
+    it { AutomobileFuel.find('diesel').co2_emission_factor.should be_within(1e-6).of(2.70219) }
+    it { AutomobileFuel.find('diesel').ch4_emission_factor.should be_within(1e-9).of(1.3887e-5) }
+    it { AutomobileFuel.find('diesel').n2o_emission_factor.should be_within(1e-8).of(2.5812e-4) }
+    
+    it { AutomobileFuel.find('gasoline').total_consumption.should > 455_000_000_000 }
+    it { AutomobileFuel.find('diesel').total_consumption.should > 5_800_000_000 }
+    
+    it { AutomobileFuel.find('Electricity').energy_content.should == 3.6 }
+    it { AutomobileFuel.find('Electricity').co2_emission_factor.should == nil }
+    it { AutomobileFuel.find('Electricity').co2_biogenic_emission_factor.should == nil }
+    it { AutomobileFuel.find('Electricity').ch4_emission_factor.should == 0 }
+    it { AutomobileFuel.find('Electricity').n2o_emission_factor.should == 0 }
+    
+    it "all grades of gasoline should have same annual distance and emission factors" do
+      AutomobileFuel.where("name LIKE '%gasoline'").each do |fuel|
+        fuel.common_name.should == 'gasoline'
+        fuel.annual_distance.should == AutomobileFuel.gasoline.annual_distance
+        fuel.co2_emission_factor.should == AutomobileFuel.gasoline.co2_emission_factor
+        fuel.ch4_emission_factor.should == AutomobileFuel.gasoline.ch4_emission_factor
+        fuel.n2o_emission_factor.should == AutomobileFuel.gasoline.n2o_emission_factor
+      end
     end
   end
+  
+  describe '.diesel' do
+    it { AutomobileFuel.diesel.should == AutomobileFuel.find('diesel') }
+  end
+  
+  describe '.gasoline' do
+    it { AutomobileFuel.gasoline.should == AutomobileFuel.find('gasoline') }
+  end
+  
+  describe '.fallback_blend_portion' do
+    it { AutomobileFuel.fallback_blend_portion.should be_within(1e-5).of(0.01260) }
+  end
+  
+  describe '.fallback' do
+    it { AutomobileFuel.fallback.name.should == 'fallback' }
+    it { fallback.base_fuel.should == Fuel.find('Motor Gasoline') }
+    it { fallback.blend_fuel.should == Fuel.find('Distillate Fuel Oil No. 2') }
+    it { fallback.blend_portion.should be_within(1e-5).of(0.01260) }
+    
+    it { fallback.annual_distance.should be_within(0.1).of(17629.6) }
+    it { fallback.energy_content.should be_within(1e-6).of(34.6766) }
+    it { fallback.co2_emission_factor.should be_within(1e-6).of(2.34637) }
+    it { fallback.co2_biogenic_emission_factor.should == 0.0 }
+    it { fallback.ch4_emission_factor.should be_within(1e-8).of(4.203e-4) }
+    it { fallback.n2o_emission_factor.should be_within(1e-8).of(5.665e-3) }
+    
+    it { fallback.energy_content_units.should == 'megajoules_per_litre' }
+    it { fallback.co2_emission_factor_units.should == 'kilograms_per_litre' }
+    it { fallback.co2_biogenic_emission_factor_units.should == 'kilograms_per_litre' }
+    it { fallback.ch4_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
+    it { fallback.n2o_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
+  end
+  
+  describe '#non_liquid?' do
+    it { AutomobileFuel.where(:energy_content_units => 'megajoules_per_litre').first.non_liquid?.should == false }
+    it { AutomobileFuel.where("energy_content_units != 'megajoules_per_litre'").first.non_liquid?.should == true }
+  end
+  
+  describe '#same_as?' do
+    it { AutomobileFuel.find_by_code('G').same_as?(AutomobileFuel.find_by_code 'G').should == true }
+    it { AutomobileFuel.find_by_code('G').same_as?(AutomobileFuel.find_by_code 'R').should == true }
+    it { AutomobileFuel.find_by_code('G').same_as?(AutomobileFuel.find_by_code 'D').should == false }
+  end
 end

data/spec/earth/automobile/automobile_make_model_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'earth/automobile/automobile_make_model'
+
+describe AutomobileMakeModel do
+  let(:civic) { AMM.where(:name => "Honda Civic").first }
+  let(:civic_years) { AMMY.where(:make_name => 'Honda', :model_name => 'Civic') }
+  
+  let(:civic_cng) { AMM.where(:name => "Honda Civic CNG").first }
+  let(:civic_cng_years) { AMMY.where(:make_name => 'Honda', :model_name => 'Civic CNG') }
+  
+  let(:f150_ffv) { AMM.where(:name => "Ford F150 FFV").first }
+  let(:f150_ffv_years) { AMMY.where(:make_name => 'Ford', :model_name => 'F150 FFV') }
+  
+  before :all do
+    Earth.init :automobile, :load_data_miner => true, :skip_parent_associations => true
+    require 'earth/acronyms'
+  end
+  
+  describe 'import', :data_miner => true do
+    it 'should import data' do
+      AMM.run_data_miner!
+      AMM.count.should == AMM.connection.select_value("SELECT COUNT(DISTINCT make_name, model_name) FROM #{AMMY.quoted_table_name}")
+    end
+  end
+  
+  describe 'verify', :sanity => true do
+    it { AMM.where(:fuel_code => nil).count.should == 0 }
+    it { AMM.where("fuel_efficiency_city > 0").count.should == AMM.count }
+    it { AMM.where("fuel_efficiency_highway > 0").count.should == AMM.count }
+    it { AMM.where("alt_fuel_code IS NOT NULL").count.should == 157 }
+    it { AMM.where("alt_fuel_efficiency_city > 0").count.should == 157 }
+    it { AMM.where("alt_fuel_efficiency_highway > 0").count.should == 157 }
+    it { AMM.where(:type_name => nil).count.should == 0 }
+    
+    # spot checks
+    it { civic.fuel_code.should == 'G' }
+    it { civic.fuel_efficiency_city.should be_within(1e-4).of(10.884) }
+    it { civic.fuel_efficiency_city_units.should == 'kilometres_per_litre' }
+    it { civic.fuel_efficiency_highway.should be_within(1e-4).of(14.2857) }
+    it { civic.fuel_efficiency_highway_units.should == 'kilometres_per_litre' }
+    
+    it { civic.alt_fuel_code.should == nil }
+    it { civic.alt_fuel_efficiency_city.should == nil }
+    it { civic.alt_fuel_efficiency_city_units.should == nil }
+    it { civic.alt_fuel_efficiency_highway.should == nil }
+    it { civic.alt_fuel_efficiency_highway_units.should == nil }
+    
+    it { civic.type_name.should == 'Passenger cars' }
+    
+    it { civic_cng.fuel_code.should == 'C' }
+    it { civic_cng.fuel_efficiency_city.should be_within(1e-4).of(10.5237) }
+    it { civic_cng.fuel_efficiency_city_units.should == 'kilometres_per_litre' }
+    it { civic_cng.fuel_efficiency_highway.should be_within(1e-4).of(14.1971) }
+    it { civic_cng.fuel_efficiency_highway_units.should == 'kilometres_per_litre' }
+    
+    it { f150_ffv.fuel_code.should == 'R' }
+    it { f150_ffv.fuel_efficiency_city.should be_within(1e-4).of(5.9628) }
+    it { f150_ffv.fuel_efficiency_city_units.should == 'kilometres_per_litre' }
+    it { f150_ffv.fuel_efficiency_highway.should be_within(1e-4).of(8.0427) }
+    it { f150_ffv.fuel_efficiency_highway_units.should == 'kilometres_per_litre' }
+    
+    it { f150_ffv.alt_fuel_code.should == 'E' }
+    it { f150_ffv.alt_fuel_efficiency_city.should be_within(1e-4).of(4.3744) }
+    it { f150_ffv.alt_fuel_efficiency_city_units.should == 'kilometres_per_litre' }
+    it { f150_ffv.alt_fuel_efficiency_highway.should be_within(1e-4).of(5.842) }
+    it { f150_ffv.alt_fuel_efficiency_highway_units.should == 'kilometres_per_litre' }
+    
+    it { f150_ffv.type_name.should == 'Light-duty trucks' }
+  end
+  
+  describe '#model_years' do
+    it { civic.model_years.sort.should == civic_years.sort }
+  end
+end

data/spec/earth/automobile/automobile_make_model_year_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+require 'earth/automobile/automobile_make_model_year'
+
+describe AutomobileMakeModelYear do
+  before :all do
+    Earth.init :automobile, :load_data_miner => true, :skip_parent_associations => :true
+    require 'earth/acronyms'
+  end
+  
+  describe 'import', :data_miner => true do
+    it 'should import data' do
+      AMMY.run_data_miner!
+      AMMY.count.should == AMMY.connection.select_value("SELECT COUNT(DISTINCT make_name, model_name, year) FROM #{AMMYV.quoted_table_name}")
+    end
+  end
+  
+  describe 'verify imported data', :sanity => true do
+    it 'has data from all years' do
+      (1985..2012).each do |year|
+        AMMY.where(:year => year).count.should == AMMY.connection.select_value("SELECT COUNT(DISTINCT make_name, model_name) FROM #{AutomobileMakeModelYearVariant.quoted_table_name} WHERE year = #{year}")
+      end
+    end
+    
+    # confirm make, model, year aren't missing
+    it { AMMY.where(:make_name => nil).count.should == 0 }
+    it { AMMY.where(:model_name => nil).count.should == 0 }
+    it { AMMY.where(:year => nil).count.should == 0 }
+    
+    it 'should have valid fuel codes' do
+      AMMY.connection.select_values("SELECT DISTINCT fuel_code FROM #{AMMY.quoted_table_name} WHERE fuel_code != 'G'").each do |code|
+        fail "#{code} is not a valid code" unless AutomobileMakeModelYearVariant::Parser::FUEL_CODES.values.include?(code)
+      end
+    end
+    
+    it 'should have valid alt fuel codes' do
+      AMMY.connection.select_values("SELECT DISTINCT alt_fuel_code FROM #{AMMY.quoted_table_name} WHERE alt_fuel_code IS NOT NULL").each do |code|
+        fail "#{code} is not a valid code" unless AutomobileMakeModelYearVariant::Parser::FUEL_CODES.values.include?(code)
+      end
+    end
+    
+    it { AMMY.where(:hybridity => true).count.should == 170 }
+    
+    it 'should have proper weightings' do
+      AutomobileMakeModelYear.connection.select_values("SELECT DISTINCT year FROM #{AutomobileMakeModelYear.quoted_table_name}").each do |year|
+        AMMY.where(:year => year).first.weighting.should == AutomobileYear.weighting(year)
+      end
+    end
+    
+    # confirm fuel efficiencies are valid and proper units
+    it { AMMY.where("fuel_efficiency_city > 0").count.should == AMMY.count }
+    it { AMMY.where("fuel_efficiency_highway > 0").count.should == AMMY.count }
+    it { AMMY.where(:fuel_efficiency_city_units => 'kilometres_per_litre').count.should == AMMY.count }
+    it { AMMY.where(:fuel_efficiency_highway_units => 'kilometres_per_litre').count.should == AMMY.count }
+    
+    # confirm alt fuel efficiencies are valid and proper units
+    it { AMMY.where("alt_fuel_efficiency_city > 0").count.should == AMMY.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMY.where("alt_fuel_efficiency_highway > 0").count.should == AMMY.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMY.where(:alt_fuel_efficiency_city_units => 'kilometres_per_litre').count.should == AMMY.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMY.where(:alt_fuel_efficiency_highway_units => 'kilometres_per_litre').count.should == AMMY.where("alt_fuel_code IS NOT NULL").count }
+    
+    # # spot check fuel efficiency calcs
+    it { AMMY.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
+    it { AMMY.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
+    it { AMMY.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(39.5384) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
+    it { AMMY.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
+    it { AMMY.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(38.2629) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).fuel_efficiency_city.should    be_within(0.0001).of( 8.0777) }
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).fuel_efficiency_highway.should be_within(0.0001).of(11.4789) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(5.9520) }
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(8.5029) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER'}).fuel_efficiency_city.should    be_within(0.0001).of(7.86516) }
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER'}).fuel_efficiency_highway.should be_within(0.0001).of(12.11660) }
+    
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER'}).alt_fuel_efficiency_city.should    == nil }
+    it { AMMY.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER'}).alt_fuel_efficiency_highway.should == nil }
+    
+    it { AMMY.where(:type_name => nil).count.should == 0 }
+    it { AMMY.find(:first, :conditions => {:make_name => 'Toyota', :model_name => 'Prius'}).type_name.should == 'Passenger cars' }
+    it { AMMY.find(:first, :conditions => {:make_name => 'Toyota', :model_name => 'Highlander'}).type_name.should == 'Light-duty trucks' }
+  end
+end

data/spec/earth/automobile/automobile_make_model_year_variant_spec.rb

@@ -4,138 +4,187 @@ require 'earth/automobile/automobile_make_model_year_variant'
 
 describe AutomobileMakeModelYearVariant do
   before :all do
-    Earth.init :automobile, :load_data_miner => true, :skip_parent_associations => :true
+    Earth.init :automobile, :load_data_miner => true
+    require 'earth/acronyms'
   end
   
   describe 'import', :data_miner => true do
     it 'should import data' do
-      AutomobileMakeModelYearVariant.run_data_miner!
-      AutomobileMakeModelYearVariant.count.should == 28811
+      AMMYV.run_data_miner!
+      AMMYV.count.should == 28433
     end
   end
   
   describe 'verify imported data', :sanity => true do
     # confirm we have right data from all years
-    it { AutomobileMakeModelYearVariant.where(:year => 1985).count.should == 1152 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1986).count.should == 1183 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1987).count.should == 1206 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1988).count.should == 1104 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1989).count.should == 1137 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1990).count.should == 1049 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1991).count.should == 1062 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1992).count.should == 1055 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1993).count.should ==  986 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1994).count.should ==  963 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1995).count.should ==  917 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1996).count.should ==  750 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1997).count.should ==  727 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1998).count.should ==  794 }
-    it { AutomobileMakeModelYearVariant.where(:year => 1999).count.should ==  800 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2000).count.should ==  845 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2001).count.should ==  849 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2002).count.should ==  940 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2003).count.should == 1031 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2004).count.should == 1134 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2005).count.should == 1105 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2006).count.should == 1076 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2007).count.should == 1184 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2008).count.should == 1247 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2009).count.should == 1182 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2010).count.should == 1107 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2011).count.should == 1097 }
-    it { AutomobileMakeModelYearVariant.where(:year => 2012).count.should == 1129 }
-    
-    # confirm make, model, year aren't missing
-    it { AutomobileMakeModelYearVariant.where(:make_name => nil).count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where(:model_name => nil).count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where(:year => nil).count.should == 0 }
+    it { AMMYV.where(:year => 1985).count.should == 1152 }
+    it { AMMYV.where(:year => 1986).count.should == 1183 }
+    it { AMMYV.where(:year => 1987).count.should == 1206 }
+    it { AMMYV.where(:year => 1988).count.should == 1104 }
+    it { AMMYV.where(:year => 1989).count.should == 1137 }
+    it { AMMYV.where(:year => 1990).count.should == 1049 }
+    it { AMMYV.where(:year => 1991).count.should == 1062 }
+    it { AMMYV.where(:year => 1992).count.should == 1055 }
+    it { AMMYV.where(:year => 1993).count.should ==  986 }
+    it { AMMYV.where(:year => 1994).count.should ==  963 }
+    it { AMMYV.where(:year => 1995).count.should ==  917 }
+    it { AMMYV.where(:year => 1996).count.should ==  750 }
+    it { AMMYV.where(:year => 1997).count.should ==  727 }
+    it { AMMYV.where(:year => 1998).count.should ==  794 }
+    it { AMMYV.where(:year => 1999).count.should ==  800 }
+    it { AMMYV.where(:year => 2000).count.should ==  834 }
+    it { AMMYV.where(:year => 2001).count.should ==  846 }
+    it { AMMYV.where(:year => 2002).count.should ==  933 }
+    it { AMMYV.where(:year => 2003).count.should ==  995 }
+    it { AMMYV.where(:year => 2004).count.should == 1091 }
+    it { AMMYV.where(:year => 2005).count.should == 1069 }
+    it { AMMYV.where(:year => 2006).count.should == 1043 }
+    it { AMMYV.where(:year => 2007).count.should == 1126 }
+    it { AMMYV.where(:year => 2008).count.should == 1186 }
+    it { AMMYV.where(:year => 2009).count.should == 1092 }
+    it { AMMYV.where(:year => 2010).count.should == 1107 }
+    it { AMMYV.where(:year => 2011).count.should == 1097 }
+    it { AMMYV.where(:year => 2012).count.should == 1129 }
+    
+    # confirm make, model, year, size class, and type aren't missing
+    it { AMMYV.where(:make_name => nil).count.should == 0 }
+    it { AMMYV.where(:model_name => nil).count.should == 0 }
+    it { AMMYV.where(:year => nil).count.should == 0 }
+    it { AMMYV.where(:size_class => nil).count.should == 0 }
+    it { AMMYV.where(:type_name => nil).count.should == 0 }
+    
+    # confirm it handles special characters
+    it { AMMYV.where(:make_name => 'Citroën').count.should > 13 }
+    
+    # confirm Chevy and GMC model names have been simplified
+    it { AMMYV.where("make_name IN ('Chevrolet', 'GMC') AND model_name REGEXP '^[CK][0-9]+'").count.should == 0 }
+    
+    # confirm certain hybrids have been identified
+    it { AMMYV.where(:year => 2012, :make_name => 'Buick', :model_name => 'LACROSSE HYBRID').count.should == 1 }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Buick', :model_name => 'LACROSSE HYBRID'}).fuel_efficiency.should be_within(1e-4).of(12.8701) }
+    it { AMMYV.where(:year => 2012, :make_name => 'Buick', :model_name => 'REGAL HYBRID').count.should == 1 }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Buick', :model_name => 'REGAL HYBRID'}).fuel_efficiency.should be_within(1e-4).of(12.8701) }
+    
+    # confirm dual-fuel and CNG variants have been merged and identified
+    it { AMMYV.where(:make_name => 'Chevrolet', :model_name => 'CAVALIER DUAL-FUEL', :fuel_code => 'C').count.should == 0 }
+    it { AMMYV.where(:make_name => 'Chevrolet', :model_name => 'CAVALIER DUAL-FUEL', :fuel_code => 'R', :alt_fuel_code => 'C').count.should == 5 }
+    it { AMMYV.where(:fuel_code => 'C').count.should == AMMYV.where("model_name LIKE '%CNG'").count }
+    
+    # confirm FFV variants have been merged
+    it { AMMYV.where(:fuel_code => 'E').count.should == 0 }
+    it { AMMYV.where(:alt_fuel_code => 'E').count.should > 750 }
+    
+    # confirm flex-fuel variants of models where not all variants are flex-fuel have been identified
+    it { AMMYV.where("model_name LIKE '%FFV'").count.should > 700 }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Toyota', :model_name => 'SEQUOIA FFV'}).alt_fuel_code.should == 'E' }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Toyota', :model_name => 'SEQUOIA'}).alt_fuel_code.should == nil }
+    
+    # confirm diesel variants of models where not all variants are diesel have been identified
+    it { AMMYV.where("model_name LIKE '%DIESEL'").count.should > 575 }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Volkswagen', :model_name => 'JETTA DIESEL'}).fuel_code.should == 'D' }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Volkswagen', :model_name => 'JETTA'}).fuel_code.should_not == 'D' }
+    
+    it "type name shouldn't vary within a make model" do
+      AMMYV.connection.select_values(%{
+        SELECT * FROM
+        (SELECT make_name, model_name, GROUP_CONCAT(DISTINCT type_name) AS types
+        FROM #{AMMYV.quoted_table_name}
+        GROUP BY make_name, model_name) AS t1
+        WHERE types LIKE '%,%'
+      }).count.should == 0
+    end
     
     it 'should have valid transmissions' do
-      AutomobileMakeModelYearVariant.connection.select_values("SELECT DISTINCT transmission FROM #{AutomobileMakeModelYearVariant.quoted_table_name}").each do |transmission|
-        fail "#{transmission} is not a valid transmission" unless AutomobileMakeModelYearVariant::Parser::TRANSMISSIONS.values.include?(transmission)
+      AMMYV.connection.select_values("SELECT DISTINCT transmission FROM #{AMMYV.quoted_table_name}").each do |transmission|
+        fail "#{transmission} is not a valid transmission" unless AMMYV::Parser::TRANSMISSIONS.values.include?(transmission)
       end
     end
     
     it 'should have valid speeds' do
       valid_speeds = ["1", "3", "4", "5", "6", "7", "8", "variable"]
-      AutomobileMakeModelYearVariant.connection.select_values("SELECT DISTINCT speeds FROM #{AutomobileMakeModelYearVariant.quoted_table_name}").each do |speeds|
+      AMMYV.connection.select_values("SELECT DISTINCT speeds FROM #{AMMYV.quoted_table_name}").each do |speeds|
         fail "#{speeds} is not a valid speeds" unless valid_speeds.include?(speeds)
       end
     end
     
     it 'should have valid drives' do
       valid_drives = ["FWD", "RWD", "4WD", "AWD", "PWD"] # PWD = part-time 4-wheel drive
-      AutomobileMakeModelYearVariant.connection.select_values("SELECT DISTINCT drive FROM #{AutomobileMakeModelYearVariant.quoted_table_name}").each do |drive|
+      AMMYV.connection.select_values("SELECT DISTINCT drive FROM #{AMMYV.quoted_table_name}").each do |drive|
         fail "#{drive} is not a valid drive" unless valid_drives.include?(drive)
       end
     end
     
     it 'should have valid fuel codes' do
-      AutomobileMakeModelYearVariant.connection.select_values("SELECT DISTINCT fuel_code FROM #{AutomobileMakeModelYearVariant.quoted_table_name}").each do |code|
-        fail "#{code} is not a valid code" unless AutomobileMakeModelYearVariant::Parser::FUEL_CODES.values.include?(code)
+      AMMYV.connection.select_values("SELECT DISTINCT fuel_code FROM #{AMMYV.quoted_table_name}").each do |code|
+        fail "#{code} is not a valid code" unless AMMYV::Parser::FUEL_CODES.values.include?(code)
+      end
+    end
+    
+    it 'should have valid alt fuel codes' do
+      AMMYV.connection.select_values("SELECT DISTINCT alt_fuel_code FROM #{AMMYV.quoted_table_name} WHERE alt_fuel_code IS NOT NULL").each do |code|
+        fail "#{code} is not a valid code" unless AMMYV::Parser::FUEL_CODES.values.include?(code)
       end
     end
     
     # confirm fuel efficiencies are valid and proper units
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency > 0").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency_city > 0").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency_highway > 0").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency_units = 'kilometres_per_litre'").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency_city_units = 'kilometres_per_litre'").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("fuel_efficiency_highway_units = 'kilometres_per_litre'").count.should == AutomobileMakeModelYearVariant.count }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency <= 0").count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency_city <= 0").count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency_highway <= 0").count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency_units != 'kilometres_per_litre'").count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency_city_units != 'kilometres_per_litre'").count.should == 0 }
-    it { AutomobileMakeModelYearVariant.where("alt_fuel_efficiency_highway_units != 'kilometres_per_litre'").count.should == 0 }
-    
-    # confirm carline class is present for recent years
-    it { AutomobileMakeModelYearVariant.where("year > 1997 AND carline_class IS NULL").count.should == 0 }
+    it { AMMYV.where("fuel_efficiency > 0").count.should == AMMYV.count }
+    it { AMMYV.where("fuel_efficiency_city > 0").count.should == AMMYV.count }
+    it { AMMYV.where("fuel_efficiency_highway > 0").count.should == AMMYV.count }
+    it { AMMYV.where(:fuel_efficiency_units => 'kilometres_per_litre').count.should == AMMYV.count }
+    it { AMMYV.where(:fuel_efficiency_city_units => 'kilometres_per_litre').count.should == AMMYV.count }
+    it { AMMYV.where(:fuel_efficiency_highway_units => 'kilometres_per_litre').count.should == AMMYV.count }
+    
+    # confirm alt fuel efficiencies are valid and proper units
+    it { AMMYV.where("alt_fuel_efficiency > 0").count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMYV.where("alt_fuel_efficiency_city > 0").count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMYV.where("alt_fuel_efficiency_highway > 0").count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMYV.where(:alt_fuel_efficiency_units => 'kilometres_per_litre').count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMYV.where(:alt_fuel_efficiency_city_units => 'kilometres_per_litre').count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
+    it { AMMYV.where(:alt_fuel_efficiency_highway_units => 'kilometres_per_litre').count.should == AMMYV.where("alt_fuel_code IS NOT NULL").count }
     
     # spot check fuel efficiency calcs
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency.should         be_within(0.0001).of(16.0216) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency.should         be_within(0.0001).of(16.0216) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(39.5384) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency.should         be_within(0.0001).of(39.8996) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(39.5384) }
+    it { AMMYV.find(:first, :conditions => {:year => 2012, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency.should         be_within(0.0001).of(39.8996) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency.should         be_within(0.0001).of(16.0216) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_city.should    be_within(0.0001).of(14.8800) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency_highway.should be_within(0.0001).of(17.0057) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).fuel_efficiency.should         be_within(0.0001).of(16.0216) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(38.2629) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency.should         be_within(0.0001).of(39.1489) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(40.3887) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(38.2629) }
+    it { AMMYV.find(:first, :conditions => {:year => 2011, :make_name => 'Chevrolet', :model_name => 'VOLT'}).alt_fuel_efficiency.should         be_within(0.0001).of(39.1489) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).fuel_efficiency_city.should    be_within(0.0001).of( 8.0777) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).fuel_efficiency_highway.should be_within(0.0001).of(11.4789) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).fuel_efficiency.should         be_within(0.0001).of( 9.7192) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).fuel_efficiency_city.should    be_within(0.0001).of( 8.0777) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).fuel_efficiency_highway.should be_within(0.0001).of(11.4789) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).fuel_efficiency.should         be_within(0.0001).of( 9.7192) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(5.9520) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(8.5029) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER', :alt_fuel_code => 'E'}).alt_fuel_efficiency.should         be_within(0.0001).of(7.1797) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).alt_fuel_efficiency_city.should    be_within(0.0001).of(5.9520) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).alt_fuel_efficiency_highway.should be_within(0.0001).of(8.5029) }
+    it { AMMYV.find(:first, :conditions => {:year => 2010, :make_name => 'Dodge', :model_name => 'AVENGER FFV'}).alt_fuel_efficiency.should         be_within(0.0001).of(7.1797) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency_city.should    be_within(0.0001).of(20.2602) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency_highway.should be_within(0.0001).of(19.1879) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency.should         be_within(0.0001).of(19.6347) }
+    it { AMMYV.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency_city.should    be_within(0.0001).of(20.2602) }
+    it { AMMYV.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency_highway.should be_within(0.0001).of(19.1879) }
+    it { AMMYV.find(:first, :conditions => {:year => 2009, :make_name => 'Toyota', :model_name => 'PRIUS'}).fuel_efficiency.should         be_within(0.0001).of(19.6347) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_city.should    be_within(0.0001).of( 7.9773) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_highway.should be_within(0.0001).of(10.2480) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency.should         be_within(0.0001).of( 9.1305) }
+    it { AMMYV.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_city.should    be_within(0.0001).of( 7.9773) }
+    it { AMMYV.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_highway.should be_within(0.0001).of(10.2480) }
+    it { AMMYV.find(:first, :conditions => {:year => 1998, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency.should         be_within(0.0001).of( 9.1305) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_city.should    be_within(0.0001).of( 7.7886) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_highway.should be_within(0.0001).of(10.3739) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency.should         be_within(0.0001).of( 9.0782) }
+    it { AMMYV.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_city.should    be_within(0.0001).of( 7.7886) }
+    it { AMMYV.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency_highway.should be_within(0.0001).of(10.3739) }
+    it { AMMYV.find(:first, :conditions => {:year => 1997, :make_name => 'Honda', :model_name => 'ODYSSEY'}).fuel_efficiency.should         be_within(0.0001).of( 9.0782) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency_city.should    be_within(0.0001).of(5.8670) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency_highway.should be_within(0.0001).of(8.2903) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency.should         be_within(0.0001).of(7.0399) }
+    it { AMMYV.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency_city.should    be_within(0.0001).of(5.8670) }
+    it { AMMYV.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency_highway.should be_within(0.0001).of(8.2903) }
+    it { AMMYV.find(:first, :conditions => {:year => 1995, :make_name => 'Jaguar', :model_name => 'XJR'}).fuel_efficiency.should         be_within(0.0001).of(7.0399) }
     
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency_city.should    be_within(0.0001).of(5.8479) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency_highway.should be_within(0.0001).of(7.3958) }
-    it { AutomobileMakeModelYearVariant.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency.should         be_within(0.0001).of(6.6401) }
+    it { AMMYV.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency_city.should    be_within(0.0001).of(5.8479) }
+    it { AMMYV.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency_highway.should be_within(0.0001).of(7.3958) }
+    it { AMMYV.find(:first, :conditions => {:year => 1985, :make_name => 'Jaguar', :model_name => 'XJ'}).fuel_efficiency.should         be_within(0.0001).of(6.6401) }
   end
 end