diff --git a/exposan/saf/models.py b/exposan/saf/analyses/models.py
similarity index 99%
rename from exposan/saf/models.py
rename to exposan/saf/analyses/models.py
index dc58d339..b3a45823 100644
--- a/exposan/saf/models.py
+++ b/exposan/saf/analyses/models.py
@@ -13,6 +13,10 @@
 for license details.
 '''
 
+'''
+NOT READY FOR USE
+'''
+
 import numpy as np, pandas as pd, qsdsan as qs
 from chaospy import distributions as shape
 from exposan.saf import (
diff --git a/tests/test_saf.py b/tests/test_saf.py
index 9799043e..4a7f43c9 100644
--- a/tests/test_saf.py
+++ b/tests/test_saf.py
@@ -22,9 +22,10 @@ def test_saf():
     # Because of different CF settings for ImpactItem with the same ID
     from qsdsan.utils import clear_lca_registries
     clear_lca_registries()
-
-    saf.load(configuration='baseline')
     rtol = 0.01
+    
+    saf.load(configuration='baseline')
+    saf.simulate_and_print(saf.sys)
     assert_allclose(saf.get_MFSP(saf.sys), 3.95586679600505, rtol=rtol)
     assert_allclose(saf.get_GWP(saf.sys), -5.394022805849971, rtol=rtol)