diff --git a/ale/base/data_isis.py b/ale/base/data_isis.py
index ec49ef7c1..9dac41497 100644
--- a/ale/base/data_isis.py
+++ b/ale/base/data_isis.py
@@ -140,12 +140,12 @@ def rotate_state(table, rotation):
     else:
         raise ValueError('No positions are available in the input table.')
 
-    rotated_pos = rotation.apply_at(positions, ephemeris_times)
-    if velocities is not None:
-        rotated_vel = rotation.rotate_velocity_at(positions, velocities, ephemeris_times)
-    else:
-        rotated_vel = None
-    return rotated_pos, rotated_vel, ephemeris_times
+    # rotated_pos = rotation.apply_at(positions, ephemeris_times)
+    # if velocities is not None:
+    #     rotated_vel = rotation.rotate_velocity_at(positions, velocities, ephemeris_times)
+    # else:
+    #     rotated_vel = None
+    return positions, velocities, ephemeris_times
 
 class IsisSpice():
     """Mixin class for reading from an ISIS cube that has been spiceinit'd
diff --git a/ale/base/data_naif.py b/ale/base/data_naif.py
index dad57ad0b..3620ffc8b 100644
--- a/ale/base/data_naif.py
+++ b/ale/base/data_naif.py
@@ -307,10 +307,7 @@ def reference_frame(self):
         String name of the target reference frame
         """
         if not hasattr(self, "_reference_frame"):
-            try:
-                self._reference_frame = spice.cidfrm(spice.bodn2c(self.target_name))[1]
-            except:
-                self._reference_frame = 'IAU_{}'.format(self.target_name)
+            self._reference_frame = "J2000"
         return self._reference_frame
 
     @property
@@ -328,7 +325,9 @@ def sun_position(self):
         : (sun_positions, sun_velocities)
           a tuple containing a list of sun positions, a list of sun velocities
         """
-        times = [self.center_ephemeris_time]
+        times = self.ephemeris_time
+        if len(times) > 1:
+            times = [times[0], times[-1]]
         positions = []
         velocities = []
 
@@ -433,13 +432,13 @@ def frame_chain(self):
             if nadir:
                 # Logic for nadir calculation was taken from ISIS3
                 #  SpiceRotation::setEphemerisTimeNadir
-                rotation = self._frame_chain.compute_rotation(self.target_frame_id, 1)
+                # rotation = self._frame_chain.compute_rotation(self.target_frame_id, 1)
                 p_vec, v_vec, times = self.sensor_position
-                rotated_positions = rotation.apply_at(p_vec, times)
-                rotated_velocities = rotation.rotate_velocity_at(p_vec, v_vec, times)
+                # rotated_positions = rotation.apply_at(p_vec, times)
+                # rotated_velocities = rotation.rotate_velocity_at(p_vec, v_vec, times)
 
-                p_vec = rotated_positions
-                v_vec = rotated_velocities
+                # p_vec = rotated_positions
+                # v_vec = rotated_velocities
 
                 velocity_axis = 2
                 # Get the default line translation with no potential flipping
diff --git a/ale/formatters/formatter.py b/ale/formatters/formatter.py
index 6de191370..a1f35b94f 100644
--- a/ale/formatters/formatter.py
+++ b/ale/formatters/formatter.py
@@ -173,10 +173,8 @@ def to_isd(driver):
     instrument_position['spk_table_original_size'] = len(times)
     instrument_position['ephemeris_times'] = times
     # Rotate positions and velocities into J2000 then scale into kilometers
-    velocities = j2000_rotation.rotate_velocity_at(positions, velocities, times)/1000
-    positions = j2000_rotation.apply_at(positions, times)/1000
-    instrument_position['positions'] = positions
-    instrument_position['velocities'] = velocities
+    instrument_position['positions'] = np.array(positions)/1000
+    instrument_position['velocities'] = np.array(velocities)/1000
     instrument_position["reference_frame"] = j2000_rotation.dest
 
     meta_data['instrument_position'] = instrument_position
@@ -188,10 +186,8 @@ def to_isd(driver):
     sun_position['spk_table_original_size'] = len(times)
     sun_position['ephemeris_times'] = times
     # Rotate positions and velocities into J2000 then scale into kilometers
-    velocities = j2000_rotation.rotate_velocity_at(positions, velocities, times)/1000
-    positions = j2000_rotation.apply_at(positions, times)/1000
-    sun_position['positions'] = positions
-    sun_position['velocities'] = velocities
+    sun_position['positions'] = np.array(positions)/1000
+    sun_position['velocities'] =  np.array(velocities)/1000
     sun_position["reference_frame"] = j2000_rotation.dest
 
     meta_data['sun_position'] = sun_position
diff --git a/tests/pytests/data/isds/chandrayaan_mrffr_isd.json b/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
index face8ebe0..e1a9f61d3 100644
--- a/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
+++ b/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
@@ -58667,24 +58667,35 @@
     "reference_frame": 1
   },
   "sun_position": {
-    "spk_table_start_time": 284618274.5028643,
-    "spk_table_end_time": 284618274.5028643,
-    "spk_table_original_size": 1,
+    "spk_table_start_time": 284618195.65060276,
+    "spk_table_end_time": 284618353.35512584,
+    "spk_table_original_size": 2,
     "ephemeris_times": [
-      284618274.5028643
+      284618195.65060276,
+      284618353.35512584
     ],
     "positions": [
       [
-        43780497.0799206,
-        -129064945.41639775,
-        -55987592.45489679
+        43778143.55392006,
+        -129065559.6861403,
+        -55987861.91428987
+      ],
+      [
+        43782850.604594715,
+        -129064331.09970973,
+        -55987322.97221424
       ]
     ],
     "velocities": [
       [
-        29.84809594419459,
-        7.7898174083485205,
-        3.41947441993111
+        29.847298686635785,
+        7.789832883807146,
+        3.417134417900032
+      ],
+      [
+        29.84725641918019,
+        7.791031989531442,
+        3.4176990497686637
       ]
     ],
     "reference_frame": 1
diff --git a/tests/pytests/data/isds/chandrayannM3_isd.json b/tests/pytests/data/isds/chandrayannM3_isd.json
index eb7c86c3f..7a338edab 100644
--- a/tests/pytests/data/isds/chandrayannM3_isd.json
+++ b/tests/pytests/data/isds/chandrayannM3_isd.json
@@ -390,24 +390,35 @@
     "reference_frame": 1
   },
   "sun_position": {
-    "spk_table_start_time": 299622941.73534995,
-    "spk_table_end_time": 299622941.73534995,
-    "spk_table_original_size": 1,
+    "spk_table_start_time": 299622941.60814995,
+    "spk_table_end_time": 299622941.86254996,
+    "spk_table_original_size": 2,
     "ephemeris_times": [
-      299622941.73534995
+      299622941.60814995,
+      299622941.86254996
     ],
     "positions": [
       [
-        -22279396.272817865,
-        138086310.683749,
-        59901633.861951254
+        -22279392.552556925,
+        138086311.0772047,
+        59901634.029351056
+      ],
+      [
+        -22279399.993010454,
+        138086310.29030323,
+        59901633.69455383
       ]
     ],
     "velocities": [
       [
-        -29.247063986944152,
-        -3.0931661850381134,
-        -1.3160268288136903
+        -29.247063783209654,
+        -3.0931654356540093,
+        -1.3160264669418211
+      ],
+      [
+        -29.24706420755107,
+        -3.0931669393224728,
+        -1.3160271856310302
       ]
     ],
     "reference_frame": 1
diff --git a/tests/pytests/data/isds/mexhrsc_isd.json b/tests/pytests/data/isds/mexhrsc_isd.json
index 53768b759..79bea624d 100644
--- a/tests/pytests/data/isds/mexhrsc_isd.json
+++ b/tests/pytests/data/isds/mexhrsc_isd.json
@@ -1,6 +1,150 @@
 {
-  "CameraVersion": 1,
-  "NaifKeywords": {
+  "isis_camera_version": 1,
+  "image_lines": 15088,
+  "image_samples": 1288,
+  "name_platform": "MARS EXPRESS",
+  "name_sensor": "MEX_HRSC_IR",
+  "reference_height": {
+    "maxheight": 1000,
+    "minheight": -1000,
+    "unit": "m"
+  },
+  "name_model": "USGS_ASTRO_LINE_SCANNER_SENSOR_MODEL",
+  "interpolation_method": "lagrange",
+  "line_scan_rate": [
+    [
+      1,
+      255744599.02748165,
+      0.012800790786743165
+    ],
+    [
+      6665,
+      255744684.33197814,
+      0.012907449722290038
+    ],
+    [
+      6666,
+      255744684.34504557,
+      0.013227428436279297
+    ]
+  ],
+  "starting_ephemeris_time": 255744599.02748165,
+  "center_ephemeris_time": 255744697.39357847,
+  "radii": {
+    "semimajor": 3396.19,
+    "semiminor": 3376.2,
+    "unit": "km"
+  },
+  "body_rotation": {
+    "time_dependent_frames": [
+      10014,
+      1
+    ],
+    "ck_table_start_time": 255744599.02748,
+    "ck_table_end_time": 255744635.91477,
+    "ck_table_original_size": 2,
+    "ephemeris_times": [
+      255744599.02748,
+      255744635.91477
+    ],
+    "quaternions": [
+      [
+        -0.6525755651363003,
+        -0.0231514239139282,
+        0.3174415084289179,
+        -0.6876336467074378
+      ],
+      [
+        -0.6534739684048748,
+        -0.022736404778153148,
+        0.31747150360998055,
+        -0.68677993048033
+      ]
+    ],
+    "angular_velocities": [
+      [
+        3.1623981615137114e-05,
+        -2.8803031775991542e-05,
+        5.6520727317788564e-05
+      ],
+      [
+        3.1623981615032794e-05,
+        -2.8803031777148914e-05,
+        5.6520727317257115e-05
+      ]
+    ],
+    "reference_frame": 1
+  },
+  "instrument_pointing": {
+    "time_dependent_frames": [
+      -41001,
+      1
+    ],
+    "ck_table_start_time": 255744599.02748,
+    "ck_table_end_time": 255744635.91477,
+    "ck_table_original_size": 3,
+    "ephemeris_times": [
+      255744599.02748,
+      255744623.61901,
+      255744635.91477
+    ],
+    "quaternions": [
+      [
+        -0.34147103206303764,
+        0.46006200041554185,
+        -0.48264106492774883,
+        -0.6624183666542334
+      ],
+      [
+        -0.34862899148129517,
+        0.4555408857335137,
+        -0.47327265910130095,
+        -0.668545673735942
+      ],
+      [
+        -0.3521802679309037,
+        0.45323805476596757,
+        -0.46855266563769715,
+        -0.6715673637959837
+      ]
+    ],
+    "angular_velocities": [
+      [
+        0.00035176331113592204,
+        0.0010154650024473103,
+        0.00038771759244781866
+      ],
+      [
+        0.00035242855802833725,
+        0.0010149701470475953,
+        0.0003878218830533074
+      ],
+      [
+        0.0003502620823697415,
+        0.001017194110775444,
+        0.00038476436104443903
+      ]
+    ],
+    "reference_frame": 1,
+    "constant_frames": [
+      -41210,
+      -41200,
+      -41000,
+      -41001
+    ],
+    "constant_rotation": [
+      -0.9999999844629888,
+      1.027590578527487e-06,
+      0.00017627525841189352,
+      1.2246232944813223e-16,
+      -0.9999830090976747,
+      0.00582936668603668,
+      0.0001762782535384808,
+      0.0058293665954657434,
+      0.9999829935609271
+    ]
+  },
+  "naif_keywords": {
     "BODY499_RADII": [
       3396.19,
       3396.19,
@@ -139,177 +283,113 @@
     ],
     "INS-41218_IFOV": 4e-05
   },
-  "InstrumentPointing": {
-    "TimeDependentFrames": [
-      -41001,
-      1
-    ],
-    "CkTableStartTime": 255744599.02748,
-    "CkTableEndTime": 255744635.91477,
-    "CkTableOriginalSize": 3,
-    "EphemerisTimes": [
+  "detector_sample_summing": 1,
+  "detector_line_summing": 1,
+  "focal_length_model": {
+    "focal_length": 175.0
+  },
+  "detector_center": {
+    "line": 0.0,
+    "sample": 2592.0
+  },
+  "focal2pixel_lines": [
+    0.0,
+    0.0,
+    111.111111111111
+  ],
+  "focal2pixel_samples": [
+    0.0,
+    111.111111111111,
+    0.0
+  ],
+  "optical_distortion": {
+    "radial": {
+      "coefficients": [
+        0.0,
+        0.0,
+        0.0
+      ]
+    }
+  },
+  "starting_detector_line": 0,
+  "starting_detector_sample": 0,
+  "instrument_position": {
+    "spk_table_start_time": 255744599.02748,
+    "spk_table_end_time": 255744635.91477,
+    "spk_table_original_size": 3,
+    "ephemeris_times": [
       255744599.02748,
       255744623.61901,
       255744635.91477
     ],
-    "Quaternions": [
+    "positions": [
       [
-        -0.34147103206303764,
-        0.46006200041554185,
-        -0.48264106492774883,
-        -0.6624183666542334
+        3508.7678822054822,
+        -1180.0905787748716,
+        -404.658065935862
       ],
       [
-        -0.34862899148129517,
-        0.4555408857335137,
-        -0.47327265910130095,
-        -0.668545673735942
+        3509.658413801418,
+        -1143.432435950031,
+        -502.60294632048493
       ],
       [
-        -0.3521802679309037,
-        0.45323805476596757,
-        -0.46855266563769715,
-        -0.6715673637959837
+        3509.4431532823464,
+        -1124.8866548757137,
+        -551.4851113671582
       ]
     ],
-    "AngularVelocity": [
+    "velocities": [
       [
-        0.00035176331113592204,
-        0.0010154650024473103,
-        0.00038771759244781866
-      ],
-      [
-        0.00035242855802833725,
-        0.0010149701470475953,
-        0.0003878218830533074
+        0.07204008324341306,
+        1.478737567336345,
+        -3.987265079143157
       ],
       [
-        0.0003502620823697415,
-        0.001017194110775444,
-        0.00038476436104443903
-      ]
-    ],
-    "ConstantFrames": [
-      -41210,
-      -41200,
-      -41000,
-      -41001
-    ],
-    "ConstantRotation": [
-      -0.9999999844629888,
-      1.027590578527487e-06,
-      0.00017627525841189352,
-      1.2246232944813223e-16,
-      -0.9999830090976747,
-      0.00582936668603668,
-      0.0001762782535384808,
-      0.0058293665954657434,
-      0.9999829935609271
-    ]
-  },
-  "BodyRotation": {
-    "TimeDependentFrames": [
-      10014,
-      1
-    ],
-    "CkTableStartTime": 255744599.02748,
-    "CkTableEndTime": 255744635.91477,
-    "CkTableOriginalSize": 2,
-    "EphemerisTimes": [
-      255744599.02748,
-      255744635.91477
-    ],
-    "Quaternions": [
-      [
-        -0.6525755651363003,
-        -0.0231514239139282,
-        0.3174415084289179,
-        -0.6876336467074378
+        0.00039300972257281586,
+        1.5024971608942188,
+        -3.978142968473584
       ],
       [
-        -0.6534739684048748,
-        -0.022736404778153148,
-        0.31747150360998055,
-        -0.68677993048033
+        -0.03540185319249391,
+        1.5140837760766441,
+        -3.9728346761198687
       ]
     ],
-    "AngularVelocity": [
-      [
-        3.1623981615137114e-05,
-        -2.8803031775991542e-05,
-        5.6520727317788564e-05
-      ],
-      [
-        3.1623981615032794e-05,
-        -2.8803031777148914e-05,
-        5.6520727317257115e-05
-      ]
-    ]
+    "reference_frame": 1
   },
-  "InstrumentPosition": {
-    "SpkTableStartTime": 255744599.02748,
-    "SpkTableEndTime": 255744635.91477,
-    "SpkTableOriginalSize": 3,
-    "EphemerisTimes": [
+  "sun_position": {
+    "spk_table_start_time": 255744599.02748,
+    "spk_table_end_time": 255744635.91477,
+    "spk_table_original_size": 2,
+    "ephemeris_times": [
       255744599.02748,
-      255744623.61901,
       255744635.91477
     ],
-    "Positions": [
+    "positions": [
       [
-        3508.767882205483,
-        -1180.0905787748716,
-        -404.65806593586274
+        99136929.53824691,
+        -200428537.63631,
+        -94608622.07353032
       ],
       [
-        3509.6584138034805,
-        -1143.4324359444547,
-        -502.6029463187759
-      ],
-      [
-        3509.443153282348,
-        -1124.8866548757137,
-        -551.4851113671583
+        99137711.51947758,
+        -200428267.09869853,
+        -94608519.11093453
       ]
     ],
-    "Velocities": [
-      [
-        0.07204008324341267,
-        1.4787375673363454,
-        -3.987265079143158
-      ],
+    "velocities": [
       [
-        0.00039300972273872503,
-        1.5024971608516042,
-        -3.9781429683723304
+        21.199222172569403,
+        7.3341345273038865,
+        2.791259509825317
       ],
       [
-        -0.03540185319107661,
-        1.5140837760075843,
-        -3.9728346759699815
-      ]
-    ]
-  },
-  "SunPosition": {
-    "SpkTableStartTime": 255744697.39357847,
-    "SpkTableEndTime": 255744697.39357847,
-    "SpkTableOriginalSize": 1,
-    "EphemerisTimes": [
-      255744697.39357847
-    ],
-    "Positions": [
-      [
-        97397666.49661352,
-        -201380879.84291452,
-        -94392949.82617083
+        21.19918826362927,
+        7.334203076766468,
+        2.7912918675191167
       ]
     ],
-    "Velocities": [
-      [
-        21.26085734409839,
-        7.173393107736484,
-        2.739595059792977
-      ]
-    ]
+    "reference_frame": 1
   }
 }
\ No newline at end of file
diff --git a/tests/pytests/test_chandrayaan_driver.py b/tests/pytests/test_chandrayaan_driver.py
index 637d7cb73..00836e2ca 100644
--- a/tests/pytests/test_chandrayaan_driver.py
+++ b/tests/pytests/test_chandrayaan_driver.py
@@ -34,7 +34,7 @@ def test_chandrayaan_load(m3_kernels):
     label_file = get_image_label("M3T20090630T083407_V03_RDN", label_type="isis")
     compare_dict = get_isd("chandrayannM3")
 
-    isd_str = ale.loads(label_file, props={"kernels": m3_kernels}, verbose=True)
+    isd_str = ale.loads(label_file, props={"kernels": m3_kernels}, verbose=False)
     isd_obj = json.loads(isd_str)
     x = compare_dicts(isd_obj, compare_dict)
     assert x == []
@@ -43,7 +43,7 @@ def test_chandrayaan_mrffr_load(mrffr_kernels):
     label_file = get_image_label("fsb_00720_1cd_xhu_84n209_v1", label_type="isis3")
     compare_dict = get_isd("chandrayaan_mrffr")
 
-    isd_str = ale.loads(label_file, props={"kernels": mrffr_kernels, "nadir": True}, verbose=True)
+    isd_str = ale.loads(label_file, props={"kernels": mrffr_kernels, "nadir": True}, verbose=False)
     isd_obj = json.loads(isd_str)
     x = compare_dicts(isd_obj, compare_dict)
     assert x == []
diff --git a/tests/pytests/test_data_isis.py b/tests/pytests/test_data_isis.py
index 482266273..378911ed6 100644
--- a/tests/pytests/test_data_isis.py
+++ b/tests/pytests/test_data_isis.py
@@ -635,10 +635,10 @@ def test_sun_position_cache(testdata):
         'J2000ZV' : [0, 0],
         'ET' : [0, 1]}
     sun_pos, sun_vel, sun_times = testdata.sun_position
-    np.testing.assert_almost_equal(sun_pos, [[1000, 0, 0], [0, 0, 1000]])
+    np.testing.assert_almost_equal(sun_pos, [[1000, 0, 0], [0, 1000, 0]])
     np.testing.assert_almost_equal(sun_vel,
-                                   [[-1000, -2000*np.pi*np.sqrt(3)/9, 2000*np.pi*np.sqrt(3)/9],
-                                    [-2000*np.pi*np.sqrt(3)/9, 2000*np.pi*np.sqrt(3)/9, -1000]])
+                                   [[-1000, 0, 0],
+                                    [0, -1000, 0]])
     np.testing.assert_equal(sun_times, [0, 1])
 
 def test_sun_position_polynomial(testdata):
@@ -665,10 +665,10 @@ def test_sun_position_polynomial(testdata):
         'J2000SVZ' : [0, -1, 1]}
 
     sun_pos, sun_vel, sun_times = testdata.sun_position
-    np.testing.assert_almost_equal(sun_pos, [[1000, 0, 0], [-1000, 0, 1000]])
+    np.testing.assert_almost_equal(sun_pos, [[1000, 0, 0], [0, 1000, -1000]])
     np.testing.assert_almost_equal(sun_vel,
-                                   [[-500, 500 - 1000*np.pi*np.sqrt(3)/9, -500 + 1000*np.pi*np.sqrt(3)/9],
-                                    [-500 - 1000*np.pi*np.sqrt(3)/9, -500 + 2000*np.pi*np.sqrt(3)/9, 500 - 1000*np.pi*np.sqrt(3)/9]])
+                                   [[-500, 500, -500],
+                                    [-500, 500, -500]])
     np.testing.assert_equal(sun_times, [2, 4])
 
 def test_inst_position_cache(testdata):
@@ -695,10 +695,10 @@ def test_inst_position_cache(testdata):
         'J2000ZV' : [0, 0],
         'ET' : [0, 1]}
     sensor_pos, sensor_vel, sensor_times = testdata.sensor_position
-    np.testing.assert_almost_equal(sensor_pos, [[1000, 0, 0], [0, 0, 1000]])
+    np.testing.assert_almost_equal(sensor_pos, [[1000, 0, 0], [0, 1000, 0]])
     np.testing.assert_almost_equal(sensor_vel,
-                                   [[-1000, -2000*np.pi*np.sqrt(3)/9, 2000*np.pi*np.sqrt(3)/9],
-                                    [-2000*np.pi*np.sqrt(3)/9, 2000*np.pi*np.sqrt(3)/9, -1000]])
+                                   [[-1000, 0, 0],
+                                    [0, -1000, 0]])
     np.testing.assert_equal(sensor_times, [0, 1])
 
 def test_no_tables():
diff --git a/tests/pytests/test_data_naif.py b/tests/pytests/test_data_naif.py
index 6c370b9c5..52280f061 100644
--- a/tests/pytests/test_data_naif.py
+++ b/tests/pytests/test_data_naif.py
@@ -69,7 +69,7 @@ def test_target_body_radii(self):
         np.testing.assert_array_equal(self.driver.target_body_radii, [3396.19, 3396.19, 3376.2 ])
 
     def test_reference_frame(self):
-        assert self.driver.reference_frame.upper() == 'IAU_MARS'
+        assert self.driver.reference_frame.upper() == 'J2000'
 
     def test_ephemeris_start_time(self):
         assert self.driver.ephemeris_start_time == -631195148.8160816
@@ -93,11 +93,13 @@ def test_correct_lt_to_surface(self):
         assert not self.driver.correct_lt_to_surface
 
     def test_sun_position(self):
+        self.driver.ephemeris_time = [297088762.61698407]
         sun_positions, sun_velocities, times = self.driver.sun_position
         assert len(sun_positions) == 1
-        np.testing.assert_allclose(sun_positions[0], [-127052102329.16032, 139728839049.65073, -88111530293.94502])
+        print(sun_positions[0])
+        np.testing.assert_allclose(sun_positions[0], [-2.08246643e+11, -7.67708707e+09, 2.10354896e+09])
         assert len(sun_velocities) == 1
-        np.testing.assert_allclose(sun_velocities[0], [9883868.06162645, 8989183.29614645, 881.9339912834714])
+        np.testing.assert_allclose(sun_velocities[0], [-210.201633, -23901.883517, -10957.47134])
         assert len(times) == 1
         np.testing.assert_allclose(times[0], 297088762.61698407)
 
@@ -110,8 +112,8 @@ def test_sensor_orientation(self):
     def test_sensor_position(self):
         self.driver.ephemeris_time = [297088762.61698407]
         positions, velocities, times = self.driver.sensor_position
-        np.testing.assert_allclose(positions[0], [-616295.93509894, -97815.27289939, -3573807.40392374])
-        np.testing.assert_allclose(velocities[0], [-3386.49396159, 411.4392769, 564.95648816])
+        np.testing.assert_allclose(positions[0], [-1886034.830689,   912111.196634, -2961826.0668])
+        np.testing.assert_allclose(velocities[0], [-1962.292328, -2807.897516,   375.459312])
         np.testing.assert_allclose(times[0], 297088762.61698407)
 
     def test_nadir_sensor_orientation(self):
diff --git a/tests/pytests/test_mex_drivers.py b/tests/pytests/test_mex_drivers.py
index 650d9b478..c6f0e8bf7 100644
--- a/tests/pytests/test_mex_drivers.py
+++ b/tests/pytests/test_mex_drivers.py
@@ -5,6 +5,7 @@
 import json
 from unittest.mock import patch, PropertyMock
 import unittest
+from ale.drivers import AleJsonEncoder
 from conftest import get_image_label, get_image_kernels, convert_kernels, get_isd, compare_dicts
 import ale
 
@@ -552,10 +553,8 @@ def test_mex_src_load(test_mex_src_kernels):
 
 # Eventually all label/formatter combinations should be tested. For now, isis3/usgscsm and
 # pds3/isis will fail.
-@pytest.mark.parametrize("label,formatter", [('isis3','isis'), ('pds3', 'usgscsm'),
-                                              pytest.param('isis3','usgscsm', marks=pytest.mark.xfail),
-                                              pytest.param('pds3','isis', marks=pytest.mark.xfail),])
-def test_mex_load(test_mex_hrsc_kernels, formatter, usgscsm_compare_dict, label):
+@pytest.mark.parametrize("label", [('isis3'), ('pds3')])
+def test_mex_load(test_mex_hrsc_kernels, label):
     label_file = get_image_label('h5270_0000_ir2', label)
 
     with patch('ale.drivers.mex_drivers.MexHrscPds3NaifSpiceDriver.binary_ephemeris_times', \
@@ -575,9 +574,10 @@ def test_mex_load(test_mex_hrsc_kernels, formatter, usgscsm_compare_dict, label)
         binary_ephemeris_times.return_value = [255744599.02748165, 255744599.04028246, 255744795.73322123]
         binary_exposure_durations.return_value = [0.012800790786743165, 0.012800790786743165, 0.013227428436279297]
         binary_lines.return_value = [0.5, 1.5, 15086.5]
+        usgscsm_isd = ale.load(label_file, props={'kernels': test_mex_hrsc_kernels})
+        compare_dict = get_isd("mexhrsc")
 
-        usgscsm_isd = ale.load(label_file, props={'kernels': test_mex_hrsc_kernels}, formatter=formatter)
-        assert compare_dicts(usgscsm_isd, usgscsm_compare_dict['h5270_0000_ir2'][formatter]) == []
+        assert compare_dicts(usgscsm_isd, compare_dict) == []
 
 # ========= Test mex pds3label and naifspice driver =========
 class test_mex_pds3_naif(unittest.TestCase):
diff --git a/tests/pytests/test_viking_drivers.py b/tests/pytests/test_viking_drivers.py
index 38e3da2c2..4f2d94288 100644
--- a/tests/pytests/test_viking_drivers.py
+++ b/tests/pytests/test_viking_drivers.py
@@ -271,7 +271,7 @@ def test_viking1_load(test_kernels, label_type, kernel_type, image):
         isd = ale.loads(label_file, props={'kernels': test_kernels[image]})
     else:
         label_file = os.path.join(data_root, "{}/{}.cub".format(image, image))
-        isd = ale.loads(label_file)
+        isd = ale.loads(label_file, verbose=True)
     isd_name = image
     if kernel_type == "isis":
         isd_name = isd_name + '_isis'