diff --git a/zipline/algorithm.py b/zipline/algorithm.py
index 36b0db0e..bf8c5935 100644
--- a/zipline/algorithm.py
+++ b/zipline/algorithm.py
@@ -608,7 +608,7 @@ class TradingAlgorithm(object):
                 if overwrite_sim_params:
                     self.sim_params = self.sim_params.create_new(
                         data.major_axis[0],
-                        data.major_axis[1]
+                        data.major_axis[-1]
                     )
 
                 copy_panel = data.rename(
diff --git a/zipline/testing/core.py b/zipline/testing/core.py
index 82ef63d3..5c0f9e99 100644
--- a/zipline/testing/core.py
+++ b/zipline/testing/core.py
@@ -554,7 +554,7 @@ def create_minute_df_for_asset(trading_calendar,
 
 def create_daily_df_for_asset(trading_calendar, start_day, end_day,
                               interval=1):
-    days = trading_calendar.minutes_in_range(start_day, end_day)
+    days = trading_calendar.sessions_in_range(start_day, end_day)
     days_count = len(days)
     days_arr = np.arange(days_count) + 2