diff --git a/classes/DataWarehouse/Query/Query.php b/classes/DataWarehouse/Query/Query.php
index 540113d920..1dedab6a35 100644
--- a/classes/DataWarehouse/Query/Query.php
+++ b/classes/DataWarehouse/Query/Query.php
@@ -743,7 +743,7 @@ public function getQueryString($limit = null, $offset = null, $extraHavingClause
         $select_order_by = $this->getSelectOrderBy();
 
         $format = <<<SQL
-SELECT STRAIGHT_JOIN%s
+SELECT%s
   %s
 FROM
   %s%s
@@ -784,7 +784,7 @@ public function getCountQueryString()
 SELECT
   COUNT(*) AS row_count
 FROM (
-  SELECT STRAIGHT_JOIN
+  SELECT
   %s AS total
   FROM
     %s
diff --git a/classes/DataWarehouse/Query/TimeseriesQuery.php b/classes/DataWarehouse/Query/TimeseriesQuery.php
index e085ebb729..f5c2023456 100644
--- a/classes/DataWarehouse/Query/TimeseriesQuery.php
+++ b/classes/DataWarehouse/Query/TimeseriesQuery.php
@@ -227,7 +227,7 @@ public function getQueryString(
         }
 
         $format = <<<SQL
-SELECT STRAIGHT_JOIN
+SELECT
   %s
 FROM
   %s
diff --git a/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_.json b/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_.json
index 51977633d3..29d21c4d77 100644
--- a/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_.json
+++ b/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_.json
@@ -163,13 +163,13 @@
     "indexes": [
         {
             "name": "index_account",
-            "columns": [ "account_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "account_id" ]
         },{
             "name": "index_person",
-            "columns": [ "person_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "person_id" ]
         },{
             "name": "index_resource",
-            "columns": [ "host_resource_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "host_resource_id" ]
         },{
             "name": "index_period_value",
             "columns": [ "${AGGREGATION_UNIT}" ]
diff --git a/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_day.json b/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_day.json
index 59e0af0f85..ea124982f9 100644
--- a/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_day.json
+++ b/configuration/etl/etl_tables.d/cloud_common/cloudfact_by_day.json
@@ -178,13 +178,13 @@
             "is_unique": true
         },{
             "name": "index_account",
-            "columns": [ "account_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "account_id" ]
         },{
             "name": "index_person",
-            "columns": [ "person_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "person_id" ]
         },{
             "name": "index_resource",
-            "columns": [ "host_resource_id" ]
+            "columns": [ "${AGGREGATION_UNIT}_id", "host_resource_id" ]
         },{
             "name": "index_period_value",
             "columns": [ "${AGGREGATION_UNIT}" ]
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
index d4080cebe8..1865528a11 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
@@ -364,102 +364,119 @@
             {
                 "name": "index_account",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "account_id"
                 ]
             },
             {
                 "name": "index_allocation",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "allocation_id"
                 ]
             },
             {
                 "name": "index_fos",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "fos_id"
                 ]
             },
             {
                 "name": "index_job_time_bucket_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "job_time_bucket_id"
                 ]
             },
             {
                 "name": "index_job_wait_time_bucket_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "job_wait_time_bucket_id"
                 ]
             },
             {
                 "name": "index_node_count",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "node_count"
                 ]
             },
             {
                 "name": "index_resource_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resource_organization_id"
                 ]
             },
             {
                 "name": "index_person",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_id"
                 ]
             },
             {
                 "name": "index_person_nsf_status_code",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_nsfstatuscode_id"
                 ]
             },
             {
                 "name": "index_person_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_organization_id"
                 ]
             },
             {
                 "name": "index_pi_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "piperson_organization_id"
                 ]
             },
             {
                 "name": "index_pi_person",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "principalinvestigator_person_id"
                 ]
             },
             {
                 "name": "index_processor_count",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "processor_count"
                 ]
             },
             {
                 "name": "index_queue",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "queue"
                 ]
             },
             {
                 "name": "index_resource_type",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resourcetype_id"
                 ]
             },
             {
                 "name": "index_resource",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "record_resource_id"
                 ]
             },
             {
                 "name": "index_system_account",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "systemaccount_id"
                 ]
             },
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
index fb41208c68..b3dddc7c83 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
@@ -384,54 +384,63 @@
             {
                 "name": "index_account",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "account_id"
                 ]
             },
             {
                 "name": "index_allocation",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "allocation_id"
                 ]
             },
             {
                 "name": "index_fos",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "fos_id"
                 ]
             },
             {
                 "name": "index_job_time_bucket_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "job_time_bucket_id"
                 ]
             },
             {
                 "name": "index_job_wait_time_bucket_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "job_wait_time_bucket_id"
                 ]
             },
             {
                 "name": "index_node_count",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "node_count"
                 ]
             },
             {
                 "name": "index_resource_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resource_organization_id"
                 ]
             },
             {
                 "name": "index_person",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_id"
                 ]
             },
             {
                 "name": "index_person_nsf_status_code",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_nsfstatuscode_id"
                 ]
             },
@@ -444,48 +453,56 @@
             {
                 "name": "index_person_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_organization_id"
                 ]
             },
             {
                 "name": "index_pi_organization",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "piperson_organization_id"
                 ]
             },
             {
                 "name": "index_pi_person",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "principalinvestigator_person_id"
                 ]
             },
             {
                 "name": "index_processor_count",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "processor_count"
                 ]
             },
             {
                 "name": "index_queue",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "queue"
                 ]
             },
             {
                 "name": "index_resource_type",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resourcetype_id"
                 ]
             },
             {
                 "name": "index_resource",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "record_resource_id"
                 ]
             },
             {
                 "name": "index_system_account",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "systemaccount_id"
                 ]
             },
diff --git a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json
index cdffd807ed..6738483d8b 100644
--- a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json
+++ b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json
@@ -120,7 +120,7 @@
         "indexes": [
             {
                 "name": "index_resource",
-                "columns": [ "record_resource_id" ]
+                "columns": [ "${AGGREGATION_UNIT}_id", "record_resource_id" ]
             },{
                 "name": "index_period_value",
                 "columns": [ "${AGGREGATION_UNIT}" ]
diff --git a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json
index 0c31be3f41..deab7f9a35 100644
--- a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json
+++ b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json
@@ -143,7 +143,7 @@
                 "is_unique": true
             },{
                 "name": "index_resource",
-                "columns": [ "record_resource_id" ]
+                "columns": [ "${AGGREGATION_UNIT}_id", "record_resource_id" ]
             },{
                 "name": "index_period_value",
                 "columns": [ "${AGGREGATION_UNIT}" ]
diff --git a/configuration/etl/etl_tables.d/storage/xdw/storagefact.aggregation.json b/configuration/etl/etl_tables.d/storage/xdw/storagefact.aggregation.json
index 0c57fba343..7abf92ceec 100644
--- a/configuration/etl/etl_tables.d/storage/xdw/storagefact.aggregation.json
+++ b/configuration/etl/etl_tables.d/storage/xdw/storagefact.aggregation.json
@@ -191,42 +191,49 @@
             {
                 "name": "idx_resource_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resource_id"
                 ]
             },
             {
                 "name": "idx_resourcetype_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "resourcetype_id"
                 ]
             },
             {
                 "name": "idx_mountpoint_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "mountpoint_id"
                 ]
             },
             {
                 "name": "idx_person_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "person_id"
                 ]
             },
             {
                 "name": "idx_principalinvestigator_person_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "principalinvestigator_person_id"
                 ]
             },
             {
                 "name": "idx_systemaccount_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "systemaccount_id"
                 ]
             },
             {
                 "name": "idx_fos_id",
                 "columns": [
+                    "${AGGREGATION_UNIT}_id",
                     "fos_id"
                 ]
             },
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Day-reference.csv
index 9ff328a75a..fc387de854 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Day-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-0,11.74476246,0.4533402593311067
+0,11.74476246,0.45334025933110605
 2,1520.73833333,
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Month-reference.csv
index 5fd88f864b..337882a32c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-0,11.74476246,0.7927639136921323
+0,11.74476246,0.7927639136921318
 2,1520.73833333,899.5902978802504
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Quarter-reference.csv
index 5fd88f864b..337882a32c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-0,11.74476246,0.7927639136921323
+0,11.74476246,0.7927639136921318
 2,1520.73833333,899.5902978802504
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Year-reference.csv
index 5fd88f864b..337882a32c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-0,11.74476246,0.7927639136921323
+0,11.74476246,0.7927639136921318
 2,1520.73833333,899.5902978802504
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Day-reference.csv
index ef717ed3c0..08c142000b 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Day-reference.csv
@@ -7,6 +7,6 @@ start,end
 ---------
 "User Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "Unknown - Unknown Organization",786.94978663,
-"screw - Screwdriver",28.55607495,1.6481001745519939
+"screw - Screwdriver",28.55607495,1.648100174551994
 "wrench - Wrench",5.92502157,0.31777203052917663
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Month-reference.csv
index cc81504459..63a195c88c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Month-reference.csv
@@ -7,6 +7,6 @@ start,end
 ---------
 "User Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "Unknown - Unknown Organization",786.94978663,49.52677870651827
-"screw - Screwdriver",28.55607495,2.897887933351728
+"screw - Screwdriver",28.55607495,2.8978879333517265
 "wrench - Wrench",5.92502157,0.5646676923859103
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Quarter-reference.csv
index cc81504459..63a195c88c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -7,6 +7,6 @@ start,end
 ---------
 "User Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "Unknown - Unknown Organization",786.94978663,49.52677870651827
-"screw - Screwdriver",28.55607495,2.897887933351728
+"screw - Screwdriver",28.55607495,2.8978879333517265
 "wrench - Wrench",5.92502157,0.5646676923859103
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Year-reference.csv
index cc81504459..63a195c88c 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/institution/avg_cpu_hours/aggregate-Year-reference.csv
@@ -7,6 +7,6 @@ start,end
 ---------
 "User Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "Unknown - Unknown Organization",786.94978663,49.52677870651827
-"screw - Screwdriver",28.55607495,2.897887933351728
+"screw - Screwdriver",28.55607495,2.8978879333517265
 "wrench - Wrench",5.92502157,0.5646676923859103
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Day-reference.csv
index faad2f1011..016e87c007 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Day-reference.csv
@@ -13,5 +13,5 @@ start,end
 "1 - 5hr",15.35199200,0.14055187769510497
 "5 - 10hr",15.64643256,1.3567541768245959
 "10 - 18hr",146.57418184,16.68786432652335
-18+hr,219.97624222,11.381246695013605
+18+hr,219.97624222,11.381246695013603
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Month-reference.csv
index 5c19dd7012..32c323e20d 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Month-reference.csv
@@ -13,5 +13,5 @@ start,end
 "1 - 5hr",15.35199200,0.14828397955629916
 "5 - 10hr",15.64643256,1.6155090784877295
 "10 - 18hr",146.57418184,19.833940313987615
-18+hr,219.97624222,21.001641212085456
+18+hr,219.97624222,21.001641212085453
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Quarter-reference.csv
index 5c19dd7012..32c323e20d 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -13,5 +13,5 @@ start,end
 "1 - 5hr",15.35199200,0.14828397955629916
 "5 - 10hr",15.64643256,1.6155090784877295
 "10 - 18hr",146.57418184,19.833940313987615
-18+hr,219.97624222,21.001641212085456
+18+hr,219.97624222,21.001641212085453
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Year-reference.csv
index 5c19dd7012..32c323e20d 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/jobwalltime/avg_cpu_hours/aggregate-Year-reference.csv
@@ -13,5 +13,5 @@ start,end
 "1 - 5hr",15.35199200,0.14828397955629916
 "5 - 10hr",15.64643256,1.6155090784877295
 "10 - 18hr",146.57418184,19.833940313987615
-18+hr,219.97624222,21.001641212085456
+18+hr,219.97624222,21.001641212085453
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Day-reference.csv
index b9a5411641..0b3b9ef735 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Day-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Summary,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Screwdriver,11.78708216,0.45349609465800805
+Screwdriver,11.78708216,0.45349609465800744
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Month-reference.csv
index 73d71e23c7..18c54c0c5b 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Summary,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Screwdriver,11.78708216,0.7937073313697913
+Screwdriver,11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Quarter-reference.csv
index 73d71e23c7..18c54c0c5b 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Summary,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Screwdriver,11.78708216,0.7937073313697913
+Screwdriver,11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Year-reference.csv
index 73d71e23c7..18c54c0c5b 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/none/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Summary,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Screwdriver,11.78708216,0.7937073313697913
+Screwdriver,11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv
index 97564f749c..8f668ddf26 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,10 +6,10 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Decanal Unit","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Engineering,378.41627884,57.32817719717006
+Engineering,378.41627884,57.328177197170056
 Humanities/Arts,188.13274411,16.44278594480015
 "Biological Sciences",61.98054777,20.50229784028209
-"Mathematical and Physical Sciences",39.82065205,5.553821375301377
+"Mathematical and Physical Sciences",39.82065205,5.553821375301376
 "Computer and Information Science and Engineering",27.72634218,0.5166226470825555
 Geosciences,17.24043389,1.4179492534823879
 "Social, Behavioral, and Economic Sciences",2.82983496,0.03098245418859181
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv
index 97564f749c..8f668ddf26 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,10 +6,10 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Decanal Unit","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Engineering,378.41627884,57.32817719717006
+Engineering,378.41627884,57.328177197170056
 Humanities/Arts,188.13274411,16.44278594480015
 "Biological Sciences",61.98054777,20.50229784028209
-"Mathematical and Physical Sciences",39.82065205,5.553821375301377
+"Mathematical and Physical Sciences",39.82065205,5.553821375301376
 "Computer and Information Science and Engineering",27.72634218,0.5166226470825555
 Geosciences,17.24043389,1.4179492534823879
 "Social, Behavioral, and Economic Sciences",2.82983496,0.03098245418859181
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv
index 97564f749c..8f668ddf26 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,10 +6,10 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Decanal Unit","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-Engineering,378.41627884,57.32817719717006
+Engineering,378.41627884,57.328177197170056
 Humanities/Arts,188.13274411,16.44278594480015
 "Biological Sciences",61.98054777,20.50229784028209
-"Mathematical and Physical Sciences",39.82065205,5.553821375301377
+"Mathematical and Physical Sciences",39.82065205,5.553821375301376
 "Computer and Information Science and Engineering",27.72634218,0.5166226470825555
 Geosciences,17.24043389,1.4179492534823879
 "Social, Behavioral, and Economic Sciences",2.82983496,0.03098245418859181
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Day-reference.csv
index c427bd3119..43a8925753 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Day-reference.csv
@@ -7,5 +7,5 @@ start,end
 ---------
 "PI Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "wrench - Wrench",30.99683231,2.5921018514519725
-"screw - Screwdriver",9.70024738,0.4156737000631465
+"screw - Screwdriver",9.70024738,0.4156737000631464
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Month-reference.csv
index 2fa23b9439..4907ae39a2 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Month-reference.csv
@@ -7,5 +7,5 @@ start,end
 ---------
 "PI Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "wrench - Wrench",30.99683231,4.594372527791987
-"screw - Screwdriver",9.70024738,0.724210760638751
+"screw - Screwdriver",9.70024738,0.7242107606387506
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Quarter-reference.csv
index 2fa23b9439..4907ae39a2 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -7,5 +7,5 @@ start,end
 ---------
 "PI Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "wrench - Wrench",30.99683231,4.594372527791987
-"screw - Screwdriver",9.70024738,0.724210760638751
+"screw - Screwdriver",9.70024738,0.7242107606387506
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Year-reference.csv
index 2fa23b9439..4907ae39a2 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/pi_institution/avg_cpu_hours/aggregate-Year-reference.csv
@@ -7,5 +7,5 @@ start,end
 ---------
 "PI Institution","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
 "wrench - Wrench",30.99683231,4.594372527791987
-"screw - Screwdriver",9.70024738,0.724210760638751
+"screw - Screwdriver",9.70024738,0.7242107606387506
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Day-reference.csv
index 515f72aaf4..d7eed6f5a9 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Day-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Service Provider","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-screw,12.80380650,0.5348845451952814
+screw,12.80380650,0.5348845451952812
 wrench,6.37875732,0.33815435199138116
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Month-reference.csv
index 7a60a2c2c5..5dcbd8b3b4 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Service Provider","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-screw,12.80380650,0.9353347731185212
+screw,12.80380650,0.9353347731185206
 wrench,6.37875732,0.6324232167493075
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Quarter-reference.csv
index 7a60a2c2c5..5dcbd8b3b4 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Service Provider","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-screw,12.80380650,0.9353347731185212
+screw,12.80380650,0.9353347731185206
 wrench,6.37875732,0.6324232167493075
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Year-reference.csv
index 7a60a2c2c5..5dcbd8b3b4 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/provider/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,6 +6,6 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Service Provider","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-screw,12.80380650,0.9353347731185212
+screw,12.80380650,0.9353347731185206
 wrench,6.37875732,0.6324232167493075
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Month-reference.csv
index 99d43b44ee..ebb0f2eb78 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Month-reference.csv
@@ -19,7 +19,7 @@ butter,69.17617284,23.776854550562064
 cheese,65.51148148,61.73618026540957
 flapper,41.59687500,23.13876312144338
 cherry,39.76185185,6.954023834196349
-curry,26.38536125,2.447402507695768
+curry,26.38536125,2.4474025076957675
 apple,25.40724419,7.297616841871969
 bumbleberry,13.78536797,0.22188446574737158
 boysenberry,8.50838675,2.119407176827592
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Quarter-reference.csv
index 99d43b44ee..ebb0f2eb78 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -19,7 +19,7 @@ butter,69.17617284,23.776854550562064
 cheese,65.51148148,61.73618026540957
 flapper,41.59687500,23.13876312144338
 cherry,39.76185185,6.954023834196349
-curry,26.38536125,2.447402507695768
+curry,26.38536125,2.4474025076957675
 apple,25.40724419,7.297616841871969
 bumbleberry,13.78536797,0.22188446574737158
 boysenberry,8.50838675,2.119407176827592
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Year-reference.csv
index 99d43b44ee..ebb0f2eb78 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/qos/avg_cpu_hours/aggregate-Year-reference.csv
@@ -19,7 +19,7 @@ butter,69.17617284,23.776854550562064
 cheese,65.51148148,61.73618026540957
 flapper,41.59687500,23.13876312144338
 cherry,39.76185185,6.954023834196349
-curry,26.38536125,2.447402507695768
+curry,26.38536125,2.4474025076957675
 apple,25.40724419,7.297616841871969
 bumbleberry,13.78536797,0.22188446574737158
 boysenberry,8.50838675,2.119407176827592
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Month-reference.csv
index 4a76055454..63bcb3bfb1 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Month-reference.csv
@@ -19,7 +19,7 @@ panettone,65.51148148,61.73618026540957
 bannock,56.47858025,13.419997925806559
 pumpernickel,41.59687500,23.13876312144338
 pita,39.76185185,6.954023834196349
-white,30.72301265,2.620222761601103
+white,30.72301265,2.6202227616011027
 croutons,22.13566106,4.758147308851854
 nann,13.85848617,0.21603874775956594
 black,4.96075667,0.7230367811264875
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Quarter-reference.csv
index 4a76055454..63bcb3bfb1 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -19,7 +19,7 @@ panettone,65.51148148,61.73618026540957
 bannock,56.47858025,13.419997925806559
 pumpernickel,41.59687500,23.13876312144338
 pita,39.76185185,6.954023834196349
-white,30.72301265,2.620222761601103
+white,30.72301265,2.6202227616011027
 croutons,22.13566106,4.758147308851854
 nann,13.85848617,0.21603874775956594
 black,4.96075667,0.7230367811264875
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Year-reference.csv
index 4a76055454..63bcb3bfb1 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/queue/avg_cpu_hours/aggregate-Year-reference.csv
@@ -19,7 +19,7 @@ panettone,65.51148148,61.73618026540957
 bannock,56.47858025,13.419997925806559
 pumpernickel,41.59687500,23.13876312144338
 pita,39.76185185,6.954023834196349
-white,30.72301265,2.620222761601103
+white,30.72301265,2.6202227616011027
 croutons,22.13566106,4.758147308851854
 nann,13.85848617,0.21603874775956594
 black,4.96075667,0.7230367811264875
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Month-reference.csv
index 7379826128..fd85470b32 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,7 +6,7 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Resource,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-robertson,32.08642129,2.637907688416811
+robertson,32.08642129,2.6379076884168104
 frearson,14.18197313,2.6227915143625538
 pozidriv,6.37875732,0.6324232167493075
 mortorq,2.94454458,0.21372235370901138
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Quarter-reference.csv
index 7379826128..fd85470b32 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,7 +6,7 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Resource,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-robertson,32.08642129,2.637907688416811
+robertson,32.08642129,2.6379076884168104
 frearson,14.18197313,2.6227915143625538
 pozidriv,6.37875732,0.6324232167493075
 mortorq,2.94454458,0.21372235370901138
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Year-reference.csv
index 7379826128..fd85470b32 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,7 +6,7 @@ start,end
 2016-12-22,2017-01-01
 ---------
 Resource,"CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-robertson,32.08642129,2.637907688416811
+robertson,32.08642129,2.6379076884168104
 frearson,14.18197313,2.6227915143625538
 pozidriv,6.37875732,0.6324232167493075
 mortorq,2.94454458,0.21372235370901138
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Day-reference.csv
index 329f57e48d..ccb971daa9 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Day-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Day-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Resource Type","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-"High-performance computing",11.78708216,0.45349609465800805
+"High-performance computing",11.78708216,0.45349609465800744
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Month-reference.csv
index d749ed06e2..0e5ef7a964 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Month-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Month-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Resource Type","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-"High-performance computing",11.78708216,0.7937073313697913
+"High-performance computing",11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Quarter-reference.csv
index d749ed06e2..0e5ef7a964 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Quarter-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Quarter-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Resource Type","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-"High-performance computing",11.78708216,0.7937073313697913
+"High-performance computing",11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Year-reference.csv
index d749ed06e2..0e5ef7a964 100644
--- a/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Year-reference.csv
+++ b/tests/artifacts/xdmod/regression/current/expected/reference/Jobs/resource_type/avg_cpu_hours/aggregate-Year-reference.csv
@@ -6,5 +6,5 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "Resource Type","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
-"High-performance computing",11.78708216,0.7937073313697913
+"High-performance computing",11.78708216,0.7937073313697907
 ---------
diff --git a/tests/artifacts/xdmod/rest/output/get_statistics-cd.json b/tests/artifacts/xdmod/rest/output/get_statistics-cd.json
index e595efddf3..6a186c21b7 100644
--- a/tests/artifacts/xdmod/rest/output/get_statistics-cd.json
+++ b/tests/artifacts/xdmod/rest/output/get_statistics-cd.json
@@ -206,7 +206,7 @@
                 "0.03780776457352913"
             ],
             "sem_avg_cpu_hours": [
-                "0.45349609465800805"
+                "0.45349609465800744"
             ],
             "min_processors": [
                 "1"
diff --git a/tests/artifacts/xdmod/rest/output/get_statistics-cs.json b/tests/artifacts/xdmod/rest/output/get_statistics-cs.json
index f06afd9b78..49579bc2fa 100644
--- a/tests/artifacts/xdmod/rest/output/get_statistics-cs.json
+++ b/tests/artifacts/xdmod/rest/output/get_statistics-cs.json
@@ -203,7 +203,7 @@
                 "0.03780776457352913"
             ],
             "sem_avg_cpu_hours": [
-                "0.45349609465800805"
+                "0.45349609465800744"
             ],
             "min_processors": [
                 "1"
diff --git a/tests/artifacts/xdmod/rest/output/get_statistics-pi.json b/tests/artifacts/xdmod/rest/output/get_statistics-pi.json
index f06afd9b78..49579bc2fa 100644
--- a/tests/artifacts/xdmod/rest/output/get_statistics-pi.json
+++ b/tests/artifacts/xdmod/rest/output/get_statistics-pi.json
@@ -203,7 +203,7 @@
                 "0.03780776457352913"
             ],
             "sem_avg_cpu_hours": [
-                "0.45349609465800805"
+                "0.45349609465800744"
             ],
             "min_processors": [
                 "1"
diff --git a/tests/artifacts/xdmod/rest/output/get_statistics-pub.json b/tests/artifacts/xdmod/rest/output/get_statistics-pub.json
index f06afd9b78..49579bc2fa 100644
--- a/tests/artifacts/xdmod/rest/output/get_statistics-pub.json
+++ b/tests/artifacts/xdmod/rest/output/get_statistics-pub.json
@@ -203,7 +203,7 @@
                 "0.03780776457352913"
             ],
             "sem_avg_cpu_hours": [
-                "0.45349609465800805"
+                "0.45349609465800744"
             ],
             "min_processors": [
                 "1"
diff --git a/tests/artifacts/xdmod/rest/output/get_statistics-usr.json b/tests/artifacts/xdmod/rest/output/get_statistics-usr.json
index f06afd9b78..49579bc2fa 100644
--- a/tests/artifacts/xdmod/rest/output/get_statistics-usr.json
+++ b/tests/artifacts/xdmod/rest/output/get_statistics-usr.json
@@ -203,7 +203,7 @@
                 "0.03780776457352913"
             ],
             "sem_avg_cpu_hours": [
-                "0.45349609465800805"
+                "0.45349609465800744"
             ],
             "min_processors": [
                 "1"
diff --git a/tests/ci/bootstrap.sh b/tests/ci/bootstrap.sh
index d47f1ddc53..b500b26481 100755
--- a/tests/ci/bootstrap.sh
+++ b/tests/ci/bootstrap.sh
@@ -192,6 +192,8 @@ then
     # update as it will already be in place.
     copy_template_httpd_conf
 
+    mysql < $BASEDIR/sql/recreate_indexes.sql
+
     # Restart so that the above changes take effect.
     ~/bin/services restart
 fi
diff --git a/tests/ci/sql/recreate_indexes.sql b/tests/ci/sql/recreate_indexes.sql
new file mode 100644
index 0000000000..74b59d63a4
--- /dev/null
+++ b/tests/ci/sql/recreate_indexes.sql
@@ -0,0 +1,43 @@
+ALTER TABLE modw_aggregates.jobfact_by_day 
+  DROP INDEX index_last_modified,
+  DROP INDEX index_period_value,
+  DROP INDEX index_period,
+  DROP INDEX index_account,
+  DROP INDEX index_allocation,
+  DROP INDEX index_fos,
+  DROP INDEX index_job_time_bucket_id,
+  DROP INDEX index_job_wait_time_bucket_id,
+  DROP INDEX index_node_count,
+  DROP INDEX index_person,
+  DROP INDEX index_person_nsf_status_code,
+  DROP INDEX index_person_organization,
+  DROP INDEX index_pi_organization,
+  DROP INDEX index_pi_person,
+  DROP INDEX index_processor_count,
+  DROP INDEX index_queue,
+  DROP INDEX index_resource,
+  DROP INDEX index_resource_organization,
+  DROP INDEX index_resource_type,
+  DROP INDEX index_system_account;
+
+ALTER TABLE modw_aggregates.jobfact_by_day 
+  ADD INDEX index_account (day_id,account_id),
+  ADD INDEX index_allocation (day_id,allocation_id),
+  ADD INDEX index_fos (day_id,fos_id),
+  ADD INDEX index_job_time_bucket_id (day_id,job_time_bucket_id),
+  ADD INDEX index_job_wait_time_bucket_id (day_id,job_wait_time_bucket_id),
+  ADD INDEX index_last_modified (last_modified),
+  ADD INDEX index_node_count (day_id,node_count),
+  ADD INDEX index_period (day_id),
+  ADD INDEX index_period_value (day),
+  ADD INDEX index_person (day_id,person_id),
+  ADD INDEX index_person_nsf_status_code (day_id,person_nsfstatuscode_id),
+  ADD INDEX index_person_organization (day_id,person_organization_id),
+  ADD INDEX index_pi_organization (day_id,piperson_organization_id),
+  ADD INDEX index_pi_person (day_id,principalinvestigator_person_id),
+  ADD INDEX index_processor_count (day_id,processor_count),
+  ADD INDEX index_queue (day_id,queue),
+  ADD INDEX index_resource (day_id,record_resource_id),
+  ADD INDEX index_resource_organization (day_id,resource_organization_id),
+  ADD INDEX index_resource_type (day_id,resourcetype_id),
+  ADD INDEX index_system_account (day_id,systemaccount_id);