diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index f545f843..40ea6451 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -73,6 +73,7 @@ from pytz.exceptions import UnknownTimeZoneError
 import collections
 import pendulum
 from rowingdata import rowingdata as rrdata
+from rowingdata import rowingdata_pl as rrdata_pl
 
 from rowingdata import rower as rrower
 
@@ -2619,18 +2620,21 @@ def add_c2_stroke_data_db(strokedata, workoutid, starttimeunix, csvfilename,
                        ' lapIdx': lapidx,
                        ' WorkoutState': 4,
                        ' ElapsedTime (sec)': seconds,
-                       'cum_dist': dist2
+                       'cum_dist': dist2,
+                       ' WorkoutState': 0,
                        })
 
     df.sort_values(by='TimeStamp (sec)', ascending=True)
 
     # Create CSV file name and save data to CSV file
-
-    res = df.to_csv(csvfilename, index_label='index',
-                    compression='gzip')
+    row = rrdata(df=df)
+    row.write_csv(csvfilename)
+    row = rrdata_pl(df=pl.from_pandas(row.df))
+    #res = df.to_csv(csvfilename, index_label='index',
+    #                compression='gzip')
 
 
-    data = dataplep(df, id=workoutid, bands=False, debug=debug)
+    data = dataplep(row.df, id=workoutid, bands=False, debug=debug)
 
     return data
 
diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py
index 40d0c951..5bb15c68 100644
--- a/rowers/tests/test_aworkouts.py
+++ b/rowers/tests/test_aworkouts.py
@@ -362,18 +362,6 @@ class WorkoutViewTest(TestCase):
       response = self.c.get(url)
       self.assertEqual(response.status_code,200)
 
-      url = reverse('workout_downloadmetar_view',kwargs={
-         'id': encoder.encode_hex(self.wwater.id),
-         'airportcode': 'LKHO'
-      }
-                    )
-
-      response = self.c.get(url,follow=True)
-      self.assertEqual(response.status_code,200)
-
-
-      response = self.c.get(url,follow=True)
-      self.assertEqual(response.status_code,200)
       
       # Stacked Flex Chart
       url = reverse('workout_flexchart_stacked_view',kwargs={
@@ -582,22 +570,6 @@ class WorkoutViewTest(TestCase):
       self.assertEqual(response.status_code,200)
       
       
-   def test_remove_power_view(self):
-      login = self.c.login(username=self.u.username, password=self.password)
-      self.assertTrue(login)
-      
-      url = reverse('remove_power_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
-      url2 = reverse(self.r.defaultlandingpage,
-                     kwargs={
-                        'id':encoder.encode_hex(self.wwater.id)
-                     }
-                     )
-      response = self.c.get(url)
-      self.assertRedirects(response,
-                           expected_url=url2,
-                           status_code=302,
-                           target_status_code=200
-                           )
 
    @patch('rowers.dataprep.create_engine')
    @patch('rowers.dataprep.getsmallrowdata_db')