diff --git a/test/data_for_test.py b/test/data_for_test.py
index 9e62317061554bc5de818673987fcdb11b256121..817fe5243e69e5b1c68d9821e28952dc374ce2f3 100644
--- a/test/data_for_test.py
+++ b/test/data_for_test.py
@@ -41,13 +41,11 @@ class WindowData:
         self.state_pair = u.transposed_array_from_string(states_str)
         self.states = u.expand_to_n(self.state_pair, 6)
 
-        # FIXME: these should be generalized fluxes
-        # FIXME: make a clear distinction between fluxes in physical and
-        # generalized coordinates
+        self.metrics, self.jacobians = window_metrics
+
         self.fluxes = ref.pointwise_fluxes(
                 self.states)[:,:,self.dir_internal].T.copy(order="F")
-
-        self.metrics, self.jacobians = window_metrics
+        self.generalized_fluxes = self.fluxes # FIXME: wrong
 
 
 @pytest.fixture(scope="session")
@@ -100,10 +98,6 @@ class PairData:
         self.dir_internal = data.dir_internal
 
         self.state_pair = data.states[:,2:4]
-
-        # FIXME: these should be generalized fluxes
-        # FIXME: make a clear distinction between fluxes in physical and
-        # generalized coordinates
         self.flux_pair = data.fluxes[:,2:4]
 
         weighted_metric_slice = data.metrics[2:4]/data.jacobians[2:4,None,None]
diff --git a/test/test_eigensystem.py b/test/test_eigensystem.py
index c077e6822beaf2c035da81eb92c11d161a2c915c..de1e1108da2d232ca90eedbb123f5a0c5ebe05ee 100644
--- a/test/test_eigensystem.py
+++ b/test/test_eigensystem.py
@@ -67,6 +67,7 @@ def test_roe_uniform_grid_ideal_gas(queue, pair_data):
     R_inv = R_inv_dev.get()
     lam = lam_dev.get()
 
+    # FIXME: what are Roe identity/property when metric terms are involved?
     check_roe_identity(data.state_pair, R, R_inv)
     check_roe_property(data.state_pair, data.flux_pair, R, R_inv, lam)
 
diff --git a/test/test_flux_window_ops.py b/test/test_flux_window_ops.py
index 0f4742a4822cc5e977cb7cc64fca43d05d0834be..a3e163d20d7d589dba786ff7b3d9580e2d72b8cf 100644
--- a/test/test_flux_window_ops.py
+++ b/test/test_flux_window_ops.py
@@ -48,7 +48,7 @@ class WindowResults:
         self.dir_internal = data.dir_internal
 
         self.states = data.states
-        self.fluxes = data.fluxes
+        self.generalized_fluxes = data.generalized_fluxes
         self.state_pair = pair.state_pair
 
         self.metrics = data.metrics
@@ -77,7 +77,7 @@ class WindowResults:
         self.weno_weights_neg = ref.weno_weights(
                 self.oscillation_neg, self.combined_frozen_metric)
 
-        self.consistent = ref.consistent_part(self.fluxes)
+        self.consistent = ref.consistent_part(self.generalized_fluxes)
         self.dissipation_pos = ref.dissipation_part(
                 self.R, self.char_fluxes_pos, self.weno_weights_pos, 1)
         self.dissipation_neg = ref.dissipation_part(
@@ -115,7 +115,7 @@ def test_flux_splitting(queue, window_results):
 
     prg(queue, nvars=data.nvars,
             generalized_states_frozen=data.states,
-            generalized_fluxes_frozen=data.fluxes,
+            generalized_fluxes_frozen=data.generalized_fluxes,
             R_inv=data.R_inv,
             wavespeeds=data.wavespeeds,
             characteristic_fluxes_pos=fluxes_pos_dev,
@@ -133,7 +133,7 @@ def test_weno_flux(queue, window_results):
     flux_dev = u.empty_array_on_device(queue, data.nvars)
 
     prg(queue, nvars=data.nvars,
-            generalized_fluxes=data.fluxes,
+            generalized_fluxes=data.generalized_fluxes,
             characteristic_fluxes_pos=data.char_fluxes_pos,
             characteristic_fluxes_neg=data.char_fluxes_neg,
             combined_frozen_metric=data.combined_frozen_metric,
@@ -152,7 +152,7 @@ def test_consistent_part(queue, window_results):
     consistent_dev = u.empty_array_on_device(queue, data.nvars)
 
     prg(queue, nvars=data.nvars,
-            generalized_fluxes=data.fluxes,
+            generalized_fluxes=data.generalized_fluxes,
             consistent=consistent_dev)
 
     u.compare_arrays(consistent_dev.get(), data.consistent)