diff --git a/test/test8_PyNutil_fixed.json b/test/test8_PyNutil_fixed.json
new file mode 100644
index 0000000000000000000000000000000000000000..842b226f80dec6358d62fbd09e8a5b2ca11e08aa
--- /dev/null
+++ b/test/test8_PyNutil_fixed.json
@@ -0,0 +1,8 @@
+{   "volume_path": "allen2017",
+    "label_path": "annotation_volumes/allen2017_colours.csv",
+    "segmentation_folder": "test_data/PyTest_seg",
+    "alignment_json": "test_data/PyNutil_testdataset_Nonlin_SY_fixed.json",
+    "nonlinear": true,
+    "colour": [0, 0, 0],
+    "points_json_path": "outputs/test8_PyNutil.json"
+}
\ No newline at end of file
diff --git a/testOOP.py b/testOOP.py
index f2d1ae6331bf1ffde2b3eb43f1c292213e102b1a..e4256a0a1af024534bcc152da2f901bb24b1de5e 100644
--- a/testOOP.py
+++ b/testOOP.py
@@ -1,6 +1,6 @@
 from PyNutil import PyNutil
 
-pnt = PyNutil(settings_file=r"test/test7_PyNutil.json")
+pnt = PyNutil(settings_file=r"test/test8_PyNutil_fixed.json")
 # pnt = PyNutil(settings_file=r"test/test7_PyNutil.json")
 # pnt.build_quantifier()
 
diff --git a/test_data/PyNutil_testdataset_Nonlin_SY_fixed.json b/test_data/PyNutil_testdataset_Nonlin_SY_fixed.json
new file mode 100644
index 0000000000000000000000000000000000000000..54453c095748d1dc5c77ff42a69c39cb0a61ca8c
--- /dev/null
+++ b/test_data/PyNutil_testdataset_Nonlin_SY_fixed.json
@@ -0,0 +1,6 @@
+{"name":"PyNutil_testdataset","target":"ABA_Mouse_CCFv3_2017_25um.cutlas","target-resolution":[456.0, 528.0, 320.0],"slices":[
+{"filename":"test_s001.png","nr":1,"width":1500,"height":1000,"anchoring":[-5.145275115966797, 361.8014440433213, 331.1490739071843, 456.0, 0.0, 0.0, 0.0, 0.0, -320.0]}, 
+{"filename":"test_s002.png","nr":2,"width":1500,"height":1000,"anchoring":[-3.8589563369750977, 318.7157039711191, 340.24552914037605, 456.0, 0.0, 0.0, 0.0, 0.0, -320.0],"markers":[[636.8098159509204, 603.4958601655935, 672.6993865030674, 593.3762649494021], [902.9868982011025, 615.5567336628567, 843.8650306748466, 610.8555657773691], [561.2609204260139, 750.3661510917975, 558.5889570552147, 775.5289788408462]]}, 
+{"filename":"test_s003.png","nr":3,"width":1500,"height":1000,"anchoring":[-2.8942172527313232, 275.6299638989171, 350.0189942541106, 456.0, 0.0, 0.0, 0.0, 0.0, -320.0],"markers":[[761.0429447852762, 629.2548298068077, 761.0429447852761, 629.2548298068077], [204.29447852760745, 613.6154553817848, 365.3374233128834, 612.695492180313], [482.6376861494953, 714.9876920193675, 623.0061349693251, 747.0101195952162], [434.00208292806684, 606.7676930120547, 578.8343558282207, 601.6559337626494], [959.8159509202455, 636.6145354185834, 980.0613496932516, 628.3348666053357], [957.8161415293836, 523.3987679117937, 953.3742331288344, 547.3781048758049]]}, 
+{"filename":"test_s004.png","nr":4,"width":1500,"height":1000,"anchoring":[-3.0282087922096252, 232.54422382671487, 364.1366059225139, 456.0, 0.0, 0.0, 0.0, 0.0, -320.0],"markers":[[522.6993865030674, 712.9714811407543, 530.6338374725239, 715.7313707451705], [630.6438500513034, 523.1833943062713, 550.3067484662577, 519.7792088316469], [916.4047791164191, 534.1886045162021, 962.5766871165645, 523.4590616375344], [950.8076359295408, 705.46368100121, 949.6932515337423, 701.0119595216191], [1096.1208774051677, 649.3153717520049, 1099.6932515337426, 656.8537258509658], [1030.2378410339393, 594.2011916220456, 1065.644171779141, 604.4158233670653]]}, 
+{"filename":"test_s005.png","nr":5,"width":1500,"height":1000,"anchoring":[-0.6163610816001892, 189.45848375451277, 374.2485759765199, 456.0, 0.0, 0.0, 0.0, 0.0, -320.0],"markers":[[6.441717791411037, 588.7764489420423, 186.80981595092024, 425.0229990800368], [766.3836793259812, 987.3315412211099, 834.6625766871166, 946.6421343146276], [447.4522362685242, 740.6361518118404, 565.9509202453987, 643.0542778288868], [392.2943778764543, 594.4761834437141, 542.9447852760735, 478.3808647654094], [1117.436664514756, 564.5422630203066, 788.6503067484659, 422.2631094756209], [1045.7025247722827, 975.3508578153971, 893.5582822085888, 873.045078196872]]}]}
\ No newline at end of file
diff --git a/test_data/PyTest_NL_atlasmaps/report.tsv b/test_data/PyTest_NL_atlasmaps/report.tsv
deleted file mode 100644
index fae6476ed328084c6ec5ad8b4434934b82a9af85..0000000000000000000000000000000000000000
--- a/test_data/PyTest_NL_atlasmaps/report.tsv
+++ /dev/null
@@ -1,6 +0,0 @@
-snr	name	segmented	changed	stable%
-1	test_s001.png	64578	2991	95%
-2	test_s002.png	83702	34124	59%
-3	test_s003.png	93593	67152	28%
-4	test_s004.png	97023	42643	56%
-5	test_s005.png	92810	90411	2%
diff --git a/test_data/PyTest_NL_atlasmaps/test_s001_nl_rbw.png b/test_data/PyTest_NL_atlasmaps/test_s001_nl_rbw.png
deleted file mode 100644
index 93bd1fe5f886877e0527cab8cc67e700f4b4dc19..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s001_nl_rbw.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s002_nl_rbw.png b/test_data/PyTest_NL_atlasmaps/test_s002_nl_rbw.png
deleted file mode 100644
index 54a9f73cb218991cce447cf2e4251e529b8a27f4..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s002_nl_rbw.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s003_nl_rbw.png b/test_data/PyTest_NL_atlasmaps/test_s003_nl_rbw.png
deleted file mode 100644
index 36e86826554f173137cf0d04f790592abdc00c92..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s003_nl_rbw.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s004_nl.png b/test_data/PyTest_NL_atlasmaps/test_s004_nl.png
deleted file mode 100644
index 137166691bab7e5f4e0f8d5a02371cbef04dad7a..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s004_nl.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s004_nl_rbw.png b/test_data/PyTest_NL_atlasmaps/test_s004_nl_rbw.png
deleted file mode 100644
index a2e7fc527af3acfe2705ce77c7726846ee178272..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s004_nl_rbw.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s005_nl_rbw.png b/test_data/PyTest_NL_atlasmaps/test_s005_nl_rbw.png
deleted file mode 100644
index 52258819518296ed26a457b9a95ffd23cdaf0dbd..0000000000000000000000000000000000000000
Binary files a/test_data/PyTest_NL_atlasmaps/test_s005_nl_rbw.png and /dev/null differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s001_nl.flat b/test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl.flat
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s001_nl.flat
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl.flat
diff --git a/test_data/PyTest_NL_atlasmaps/test_s001_nl.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl.png
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s001_nl.png
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl.png
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl_rbw.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl_rbw.png
new file mode 100644
index 0000000000000000000000000000000000000000..742cf759f7cfe7cda135d46ce0bbd6f8669c3369
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s001_nl_rbw.png differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s002_nl.flat b/test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl.flat
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s002_nl.flat
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl.flat
diff --git a/test_data/PyTest_NL_atlasmaps/test_s002_nl.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl.png
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s002_nl.png
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl.png
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl_rbw.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl_rbw.png
new file mode 100644
index 0000000000000000000000000000000000000000..5455ca268be872bc4ab9233344a3e5dd0c95b0b9
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s002_nl_rbw.png differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s003_nl.flat b/test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl.flat
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s003_nl.flat
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl.flat
diff --git a/test_data/PyTest_NL_atlasmaps/test_s003_nl.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl.png
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s003_nl.png
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl.png
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl_rbw.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl_rbw.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e69527bf65ca3f064ef6989ae08848ed17a104
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s003_nl_rbw.png differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s004_nl.flat b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.flat
similarity index 78%
rename from test_data/PyTest_NL_atlasmaps/test_s004_nl.flat
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.flat
index 2a28007e62e83a96147dda5c4c042bf1f51af878..cc166d7bd1befd03c89b8fa9e857d56b979f9aba 100644
Binary files a/test_data/PyTest_NL_atlasmaps/test_s004_nl.flat and b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.flat differ
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.png
new file mode 100644
index 0000000000000000000000000000000000000000..1518143b4d86be116472f1d90e7148705f3ea3d9
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl.png differ
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl_rbw.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl_rbw.png
new file mode 100644
index 0000000000000000000000000000000000000000..23472c94287db4506c2892763e51584e2bd06db7
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s004_nl_rbw.png differ
diff --git a/test_data/PyTest_NL_atlasmaps/test_s005_nl.flat b/test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl.flat
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s005_nl.flat
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl.flat
diff --git a/test_data/PyTest_NL_atlasmaps/test_s005_nl.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl.png
similarity index 100%
rename from test_data/PyTest_NL_atlasmaps/test_s005_nl.png
rename to test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl.png
diff --git a/test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl_rbw.png b/test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl_rbw.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2755bccccb8859a79166a0060527e28964695e2
Binary files /dev/null and b/test_data/PyTest_NL_atlasmaps_fixed/test_s005_nl_rbw.png differ