diff --git a/petabtests/cases/v2.0.0/pysb/0001/0001.py b/petabtests/cases/v2.0.0/pysb/0001/0001.py
index e7024ea..6714a98 100644
--- a/petabtests/cases/v2.0.0/pysb/0001/0001.py
+++ b/petabtests/cases/v2.0.0/pysb/0001/0001.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0002/0002.py b/petabtests/cases/v2.0.0/pysb/0002/0002.py
index a273e9d..61d9cf8 100644
--- a/petabtests/cases/v2.0.0/pysb/0002/0002.py
+++ b/petabtests/cases/v2.0.0/pysb/0002/0002.py
@@ -2,7 +2,7 @@
 from math import nan
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0003/0003.py b/petabtests/cases/v2.0.0/pysb/0003/0003.py
index d0fde50..818b9df 100644
--- a/petabtests/cases/v2.0.0/pysb/0003/0003.py
+++ b/petabtests/cases/v2.0.0/pysb/0003/0003.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0004/0004.py b/petabtests/cases/v2.0.0/pysb/0004/0004.py
index 41d8184..8db9f7f 100644
--- a/petabtests/cases/v2.0.0/pysb/0004/0004.py
+++ b/petabtests/cases/v2.0.0/pysb/0004/0004.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0005/0005.py b/petabtests/cases/v2.0.0/pysb/0005/0005.py
index 2b21823..0bd7c4e 100644
--- a/petabtests/cases/v2.0.0/pysb/0005/0005.py
+++ b/petabtests/cases/v2.0.0/pysb/0005/0005.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0006/0006.py b/petabtests/cases/v2.0.0/pysb/0006/0006.py
index 79400ca..7e6ca1b 100644
--- a/petabtests/cases/v2.0.0/pysb/0006/0006.py
+++ b/petabtests/cases/v2.0.0/pysb/0006/0006.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0007/0007.py b/petabtests/cases/v2.0.0/pysb/0007/0007.py
index 1dc033e..304fba4 100644
--- a/petabtests/cases/v2.0.0/pysb/0007/0007.py
+++ b/petabtests/cases/v2.0.0/pysb/0007/0007.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_PYSB_FILE,
diff --git a/petabtests/cases/v2.0.0/pysb/0008/0008.py b/petabtests/cases/v2.0.0/pysb/0008/0008.py
index 9132eec..53e0c0e 100644
--- a/petabtests/cases/v2.0.0/pysb/0008/0008.py
+++ b/petabtests/cases/v2.0.0/pysb/0008/0008.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0009/0009.py b/petabtests/cases/v2.0.0/pysb/0009/0009.py
index 9c02a58..0a8a787 100644
--- a/petabtests/cases/v2.0.0/pysb/0009/0009.py
+++ b/petabtests/cases/v2.0.0/pysb/0009/0009.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_PYSB_FILE,
diff --git a/petabtests/cases/v2.0.0/pysb/0010/0010.py b/petabtests/cases/v2.0.0/pysb/0010/0010.py
index bf97fc9..e511f7a 100644
--- a/petabtests/cases/v2.0.0/pysb/0010/0010.py
+++ b/petabtests/cases/v2.0.0/pysb/0010/0010.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0011/0011.py b/petabtests/cases/v2.0.0/pysb/0011/0011.py
index 264f2bc..cf19b91 100644
--- a/petabtests/cases/v2.0.0/pysb/0011/0011.py
+++ b/petabtests/cases/v2.0.0/pysb/0011/0011.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0012/0012.py b/petabtests/cases/v2.0.0/pysb/0012/0012.py
index 7e99eee..614ecca 100644
--- a/petabtests/cases/v2.0.0/pysb/0012/0012.py
+++ b/petabtests/cases/v2.0.0/pysb/0012/0012.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0013/0013.py b/petabtests/cases/v2.0.0/pysb/0013/0013.py
index 1ac9e04..85a1117 100644
--- a/petabtests/cases/v2.0.0/pysb/0013/0013.py
+++ b/petabtests/cases/v2.0.0/pysb/0013/0013.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0014/0014.py b/petabtests/cases/v2.0.0/pysb/0014/0014.py
index 7350532..50ec842 100644
--- a/petabtests/cases/v2.0.0/pysb/0014/0014.py
+++ b/petabtests/cases/v2.0.0/pysb/0014/0014.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0015/0015.py b/petabtests/cases/v2.0.0/pysb/0015/0015.py
index 78bd6d2..ba8a9d9 100644
--- a/petabtests/cases/v2.0.0/pysb/0015/0015.py
+++ b/petabtests/cases/v2.0.0/pysb/0015/0015.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/pysb/0016/0016.py b/petabtests/cases/v2.0.0/pysb/0016/0016.py
index 76b561c..916d004 100644
--- a/petabtests/cases/v2.0.0/pysb/0016/0016.py
+++ b/petabtests/cases/v2.0.0/pysb/0016/0016.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_PYSB_FILE,
diff --git a/petabtests/cases/v2.0.0/pysb/0017/0017.py b/petabtests/cases/v2.0.0/pysb/0017/0017.py
index a465be7..8e044f8 100644
--- a/petabtests/cases/v2.0.0/pysb/0017/0017.py
+++ b/petabtests/cases/v2.0.0/pysb/0017/0017.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_PYSB_FILE,
diff --git a/petabtests/cases/v2.0.0/pysb/0018/0018.py b/petabtests/cases/v2.0.0/pysb/0018/0018.py
index ee32ec7..4db1d5c 100644
--- a/petabtests/cases/v2.0.0/pysb/0018/0018.py
+++ b/petabtests/cases/v2.0.0/pysb/0018/0018.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_PYSB_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0001/0001.py b/petabtests/cases/v2.0.0/sbml/0001/0001.py
index 0b6b582..5d8617a 100644
--- a/petabtests/cases/v2.0.0/sbml/0001/0001.py
+++ b/petabtests/cases/v2.0.0/sbml/0001/0001.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0002/0002.py b/petabtests/cases/v2.0.0/sbml/0002/0002.py
index 3a8fa51..d3c4f00 100644
--- a/petabtests/cases/v2.0.0/sbml/0002/0002.py
+++ b/petabtests/cases/v2.0.0/sbml/0002/0002.py
@@ -2,7 +2,7 @@
 from math import nan
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
 DESCRIPTION = cleandoc("""
diff --git a/petabtests/cases/v2.0.0/sbml/0003/0003.py b/petabtests/cases/v2.0.0/sbml/0003/0003.py
index 13f4e58..54af745 100644
--- a/petabtests/cases/v2.0.0/sbml/0003/0003.py
+++ b/petabtests/cases/v2.0.0/sbml/0003/0003.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0004/0004.py b/petabtests/cases/v2.0.0/sbml/0004/0004.py
index e0202cd..80a0cdc 100644
--- a/petabtests/cases/v2.0.0/sbml/0004/0004.py
+++ b/petabtests/cases/v2.0.0/sbml/0004/0004.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0005/0005.py b/petabtests/cases/v2.0.0/sbml/0005/0005.py
index 5676c9a..19dc7aa 100644
--- a/petabtests/cases/v2.0.0/sbml/0005/0005.py
+++ b/petabtests/cases/v2.0.0/sbml/0005/0005.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0006/0006.py b/petabtests/cases/v2.0.0/sbml/0006/0006.py
index 1cae88b..08eb66e 100644
--- a/petabtests/cases/v2.0.0/sbml/0006/0006.py
+++ b/petabtests/cases/v2.0.0/sbml/0006/0006.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0007/0007.py b/petabtests/cases/v2.0.0/sbml/0007/0007.py
index d052c14..3bf3955 100644
--- a/petabtests/cases/v2.0.0/sbml/0007/0007.py
+++ b/petabtests/cases/v2.0.0/sbml/0007/0007.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_SBML_FILE,
diff --git a/petabtests/cases/v2.0.0/sbml/0008/0008.py b/petabtests/cases/v2.0.0/sbml/0008/0008.py
index bafdb4c..1fdca0f 100644
--- a/petabtests/cases/v2.0.0/sbml/0008/0008.py
+++ b/petabtests/cases/v2.0.0/sbml/0008/0008.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0009/0009.py b/petabtests/cases/v2.0.0/sbml/0009/0009.py
index 7a03f5c..7cba34a 100644
--- a/petabtests/cases/v2.0.0/sbml/0009/0009.py
+++ b/petabtests/cases/v2.0.0/sbml/0009/0009.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_SBML_FILE,
diff --git a/petabtests/cases/v2.0.0/sbml/0010/0010.py b/petabtests/cases/v2.0.0/sbml/0010/0010.py
index 1d6e305..03b7a59 100644
--- a/petabtests/cases/v2.0.0/sbml/0010/0010.py
+++ b/petabtests/cases/v2.0.0/sbml/0010/0010.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0011/0011.py b/petabtests/cases/v2.0.0/sbml/0011/0011.py
index 13f0c80..8e769dd 100644
--- a/petabtests/cases/v2.0.0/sbml/0011/0011.py
+++ b/petabtests/cases/v2.0.0/sbml/0011/0011.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0012/0012.py b/petabtests/cases/v2.0.0/sbml/0012/0012.py
index 9c14959..fc2fdc5 100644
--- a/petabtests/cases/v2.0.0/sbml/0012/0012.py
+++ b/petabtests/cases/v2.0.0/sbml/0012/0012.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0013/0013.py b/petabtests/cases/v2.0.0/sbml/0013/0013.py
index 3147574..4c6056f 100644
--- a/petabtests/cases/v2.0.0/sbml/0013/0013.py
+++ b/petabtests/cases/v2.0.0/sbml/0013/0013.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0014/0014.py b/petabtests/cases/v2.0.0/sbml/0014/0014.py
index 58ea315..d591b3f 100644
--- a/petabtests/cases/v2.0.0/sbml/0014/0014.py
+++ b/petabtests/cases/v2.0.0/sbml/0014/0014.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0015/0015.py b/petabtests/cases/v2.0.0/sbml/0015/0015.py
index e06d169..85b9e4a 100644
--- a/petabtests/cases/v2.0.0/sbml/0015/0015.py
+++ b/petabtests/cases/v2.0.0/sbml/0015/0015.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0016/0016.py b/petabtests/cases/v2.0.0/sbml/0016/0016.py
index b386406..9ac1b6c 100644
--- a/petabtests/cases/v2.0.0/sbml/0016/0016.py
+++ b/petabtests/cases/v2.0.0/sbml/0016/0016.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_SBML_FILE,
diff --git a/petabtests/cases/v2.0.0/sbml/0017/0017.py b/petabtests/cases/v2.0.0/sbml/0017/0017.py
index b82773b..2c15fbf 100644
--- a/petabtests/cases/v2.0.0/sbml/0017/0017.py
+++ b/petabtests/cases/v2.0.0/sbml/0017/0017.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import (
     DEFAULT_SBML_FILE,
diff --git a/petabtests/cases/v2.0.0/sbml/0018/0018.py b/petabtests/cases/v2.0.0/sbml/0018/0018.py
index 4311553..d8fae9b 100644
--- a/petabtests/cases/v2.0.0/sbml/0018/0018.py
+++ b/petabtests/cases/v2.0.0/sbml/0018/0018.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 from pathlib import Path
 from petabtests import PetabTestCase, analytical_a, analytical_b
 
diff --git a/petabtests/cases/v2.0.0/sbml/0019/0019.py b/petabtests/cases/v2.0.0/sbml/0019/0019.py
index 55a9921..b7ec19d 100644
--- a/petabtests/cases/v2.0.0/sbml/0019/0019.py
+++ b/petabtests/cases/v2.0.0/sbml/0019/0019.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0020/0020.py b/petabtests/cases/v2.0.0/sbml/0020/0020.py
index d444c7f..07dbe69 100644
--- a/petabtests/cases/v2.0.0/sbml/0020/0020.py
+++ b/petabtests/cases/v2.0.0/sbml/0020/0020.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import PetabTestCase, analytical_a
 
diff --git a/petabtests/cases/v2.0.0/sbml/0021/0021.py b/petabtests/cases/v2.0.0/sbml/0021/0021.py
index 1586a4b..326cf9d 100644
--- a/petabtests/cases/v2.0.0/sbml/0021/0021.py
+++ b/petabtests/cases/v2.0.0/sbml/0021/0021.py
@@ -1,7 +1,7 @@
 from inspect import cleandoc
 
 import pandas as pd
-from petab.v1.C import *
+from petab.v2.C import *
 
 from petabtests import DEFAULT_SBML_FILE, PetabTestCase, analytical_a