diff --git a/unit_test/DataBobAngel.lua b/unit_test/DataBobAngel.lua
index 555aab33..728dbf83 100644
--- a/unit_test/DataBobAngel.lua
+++ b/unit_test/DataBobAngel.lua
@@ -214,13 +214,13 @@ data.energy["heat-exchanger"] = {
     energy_type="heat",
     energy_type_input="heat",
     energy_usage_min=0,
-    energy_usage_max=10800000,
+    energy_usage_max=7200000,
     energy_usage_priority="none",
-    energy_consumption=10800000,
+    energy_consumption=7200000,
     energy_type_output="none",
     energy_production=0,
     effectivity=1,
-    target_temperature=465,
+    target_temperature=315,
     maximum_temperature=0,
     fluid_usage=0,
     fluid_burns="none",
@@ -231,7 +231,7 @@ data.energy["heat-exchanger"] = {
     speed=1,
     recipe={type="recipe"}
 }
-data.energy["heat-exchanger-3"] = {
+data.energy["heat-exchanger-4"] = {
     energy_type="heat",
     energy_type_input="heat",
     energy_usage_min=0,
diff --git a/unit_test/DataPyanodons.lua b/unit_test/DataPyanodons.lua
index cc6e5a1e..a619f97c 100644
--- a/unit_test/DataPyanodons.lua
+++ b/unit_test/DataPyanodons.lua
@@ -22,12 +22,12 @@ data.energy["offshore-pump"] = {
     recipe={type="fluid"}
 }
 data.energy["assembling-machine-1"] = {
-    energy_type="electric",
-    energy_type_input="electric",
-    energy_usage_min=2500,
+    energy_type="burner",
+    energy_type_input="burner",
+    energy_usage_min=0,
     energy_usage_max=75000,
-    energy_usage_priority="secondary-input",
-    energy_consumption=77500,
+    energy_usage_priority="none",
+    energy_consumption=75000,
     energy_type_output="none",
     energy_production=0,
     effectivity=1,
@@ -38,17 +38,17 @@ data.energy["assembling-machine-1"] = {
     fluid_fuel = {name="none", capacity=0},
     fluid_consumption=0,
     fluid_production={name="none", amount=0},
-    pollution=4,
-    speed=0.5,
+    pollution=12,
+    speed=1,
     recipe={type="recipe"}
 }
 data.energy["assembling-machine-2"] = {
-    energy_type="electric",
-    energy_type_input="electric",
-    energy_usage_min=5000,
+    energy_type="burner",
+    energy_type_input="burner",
+    energy_usage_min=0,
     energy_usage_max=150000,
-    energy_usage_priority="secondary-input",
-    energy_consumption=155000,
+    energy_usage_priority="none",
+    energy_consumption=150000,
     energy_type_output="none",
     energy_production=0,
     effectivity=1,
@@ -59,17 +59,17 @@ data.energy["assembling-machine-2"] = {
     fluid_fuel = {name="none", capacity=0},
     fluid_consumption=0,
     fluid_production={name="none", amount=0},
-    pollution=3,
-    speed=0.75,
+    pollution=12,
+    speed=2,
     recipe={type="recipe"}
 }
 data.energy["assembling-machine-3"] = {
-    energy_type="electric",
-    energy_type_input="electric",
-    energy_usage_min=12500,
+    energy_type="burner",
+    energy_type_input="burner",
+    energy_usage_min=0,
     energy_usage_max=375000,
-    energy_usage_priority="secondary-input",
-    energy_consumption=387500,
+    energy_usage_priority="none",
+    energy_consumption=375000,
     energy_type_output="none",
     energy_production=0,
     effectivity=1,
@@ -80,27 +80,27 @@ data.energy["assembling-machine-3"] = {
     fluid_fuel = {name="none", capacity=0},
     fluid_consumption=0,
     fluid_production={name="none", amount=0},
-    pollution=2,
-    speed=1.25,
+    pollution=12,
+    speed=4,
     recipe={type="recipe"}
 }
 data.energy["boiler"] = {
     energy_type="burner",
     energy_type_input="burner",
     energy_usage_min=0,
-    energy_usage_max=1800000,
+    energy_usage_max=3701250,
     energy_usage_priority="none",
     energy_type_output="none",
-    energy_consumption=1800000,
+    energy_consumption=3701250,
     energy_production=0,
     effectivity=1,
-    target_temperature=165,
+    target_temperature=250,
     maximum_temperature=0,
     fluid_usage=0,
     fluid_burns="none",
     fluid_fuel = {name="none", capacity=0},
     fluid_consumption=0,
-    fluid_production={name="steam", amount=60},
+    fluid_production={name="steam", amount=7},--amount=7.5 but rounded
     pollution=30,
     speed=1,
     recipe={name="steam"}
@@ -111,16 +111,16 @@ data.energy["steam-engine"] = {
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=2910000,
+    energy_consumption=7275000,
     energy_type_output="electric",
-    energy_production=2910000,
+    energy_production=7275000,
     effectivity=1,
     target_temperature=0,
     maximum_temperature=500,
-    fluid_usage=30,
+    fluid_usage=15,
     fluid_burns=false,
-    fluid_fuel = {name="steam", capacity=200},
-    fluid_consumption=30,
+    fluid_fuel = {name="steam", capacity=1000},
+    fluid_consumption=15,
     fluid_production={name="none", amount=0},
     pollution=0,
     speed=1,
@@ -130,9 +130,9 @@ data.energy["heat-exchanger"] = {
     energy_type="heat",
     energy_type_input="heat",
     energy_usage_min=0,
-    energy_usage_max=10000000,
+    energy_usage_max=122220000,
     energy_usage_priority="none",
-    energy_consumption=10000000,
+    energy_consumption=122220000,
     energy_type_output="none",
     energy_production=0,
     effectivity=1,
@@ -142,42 +142,44 @@ data.energy["heat-exchanger"] = {
     fluid_burns="none",
     fluid_fuel = {name="none", capacity=0},
     fluid_consumption=0,
-    fluid_production={name="steam", amount=103},
+    fluid_production={name="steam", amount=120},
     pollution=0,
     speed=1,
     recipe={type="resource"}
 }
+--[[
 data.energy["steam-turbine"] = {
     energy_type="electric",
     energy_type_input="fluid",
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=5820000,
+    energy_consumption=29100000,
     energy_type_output="electric",
-    energy_production=5820000,--11820000 --Steam Turbine can acccept up to 2000 degree steam but there's no way to produce steam hotter than 500 degrees
-    effectivity=1,
+    energy_production=291000000,--1191000000 --Steam Turbine can acccept up to 2000 degree steam but there's no way to produce steam hotter than 500 degrees
+    effectivity=10,
     target_temperature=0,
     maximum_temperature=2000,
     fluid_usage=60,
     fluid_burns=false,
-    fluid_fuel = {name="steam", capacity=200},
+    fluid_fuel = {name="steam", capacity=1000},
     fluid_consumption=60,
     fluid_production={name="none", amount=0},
     pollution=0,
     speed=1,
     recipe={type="recipe"}
 }
+--]]
 data.energy["nuclear-reactor"] = {
     energy_type="burner",
     energy_type_input="burner",
     energy_usage_min=0,
-    energy_usage_max=40000000,
+    energy_usage_max=10000000000,
     energy_usage_priority="none",
-    energy_consumption=40000000,
+    energy_consumption=10000000000,
     energy_type_output="heat",
-    energy_production=40000000,
-    effectivity=1,
+    energy_production=2000000000,
+    effectivity=0.2,
     target_temperature=0,
     maximum_temperature=0,
     fluid_usage=0,
@@ -322,18 +324,18 @@ data.energy["oil-boiler-mk01"] = {
     energy_type="fluid",
     energy_type_input="fluid",
     energy_usage_min=0,
-    energy_usage_max=1800000,
+    energy_usage_max=14805000,
     energy_usage_priority="none",
-    energy_consumption=1800000,
+    energy_consumption=14805000,
     energy_type_output="none",
     energy_production=0,
-    effectivity=1,
-    target_temperature=165,
+    effectivity=2,
+    target_temperature=250,
     maximum_temperature=0,
     fluid_usage=0,
     fluid_burns=true,
     fluid_fuel = {name="diesel", capacity=1000},
-    fluid_consumption=1.2,
+    fluid_consumption=9.86,
     fluid_production={name="steam", amount=60},
     pollution=30,
     speed=1,
@@ -345,18 +347,18 @@ data.energy["gasturbinemk01"] = {
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=59100000,
+    energy_consumption=118200000,
     energy_type_output="electric",
-    energy_production=24822000,
-    effectivity=0.42,
+    energy_production=118200000,
+    effectivity=1,
     target_temperature=0,
     maximum_temperature=1000,
     fluid_usage=60,
     fluid_burns=false,
-    fluid_fuel = {name="combustion-mixture1", capacity=1000},
+    fluid_fuel = {name="combustion-mixture1", capacity=2000},
     fluid_consumption=60,
     fluid_production={name="none", amount=0},
-    pollution=0.06,
+    pollution=0.05,---0.06 but rounding errors,
     speed=1,
     recipe={type="recipe"}
 }
@@ -366,16 +368,16 @@ data.energy["gasturbinemk02"] = {
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=59100000,
+    energy_consumption=297750000,
     energy_type_output="electric",
-    energy_production=56145000,
-    effectivity=0.95,
+    energy_production=297750000,
+    effectivity=1,
     target_temperature=0,
-    maximum_temperature=1000,
-    fluid_usage=60,
+    maximum_temperature=2000,
+    fluid_usage=75,
     fluid_burns=false,
-    fluid_fuel = {name="combustion-mixture1", capacity=1000},
-    fluid_consumption=60,
+    fluid_fuel = {name="combustion-mixture1", capacity=2000},
+    fluid_consumption=75,
     fluid_production={name="none", amount=0},
     pollution=0.06,
     speed=1,
@@ -387,18 +389,18 @@ data.energy["gasturbinemk03"] = {
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=88650000,
+    energy_consumption=537300000,
     energy_type_output="electric",
-    energy_production=130315500,
-    effectivity=1.47,
+    energy_production=537300000,
+    effectivity=1,
     target_temperature=0,
-    maximum_temperature=1000,
+    maximum_temperature=3000,
     fluid_usage=90,
     fluid_burns=false,
-    fluid_fuel = {name="combustion-mixture1", capacity=1000},
+    fluid_fuel = {name="combustion-mixture1", capacity=2000},
     fluid_consumption=90,
     fluid_production={name="none", amount=0},
-    pollution=0.05,---0.06 but rounding errors
+    pollution=0.06,
     speed=1,
     recipe={type="recipe"}
 }
@@ -408,16 +410,16 @@ data.energy["py-turbine"] = {
     energy_usage_min=0,
     energy_usage_max=0,
     energy_usage_priority="secondary-output",
-    energy_consumption=2691900000,
+    energy_consumption=19938006000,
     energy_type_output="electric",
-    energy_production=21535200000,
-    effectivity=8,
+    energy_production=19938006000,
+    effectivity=1,
     target_temperature=0,
     maximum_temperature=5000,
-    fluid_usage=540,
+    fluid_usage=1999,
     fluid_burns=false,
-    fluid_fuel = {name="pressured-steam", capacity=1000},
-    fluid_consumption=540,
+    fluid_fuel = {name="pressured-steam", capacity=2000},
+    fluid_consumption=1999.8,
     fluid_production={name="none", amount=0},
     pollution=0.02,
     speed=1,