diff --git a/scripting/check_maestro.py b/scripting/check_maestro.py
deleted file mode 100644
index 0f248f75946c632a32d34b7a7c8b18ae07ab770b..0000000000000000000000000000000000000000
--- a/scripting/check_maestro.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# test with local pool manager only
-import maestro as M
-
-def test_local_pm():
-    M.mstro_init("test_workflow", "component1", 0)
-    cdo1 = M.mstro_cdo_declare("CDO1", None)
-    cdo2 = M.mstro_cdo_declare("CDO2", None)
-
-    M.mstro_cdo_offer(cdo1)
-    M.mstro_cdo_offer(cdo2)
-
-    cdo2_copy = M.mstro_cdo_declare("CDO2", None)
-    M.mstro_cdo_require(cdo2_copy)
-    M.mstro_cdo_demand(cdo2_copy)
-
-    M.mstro_cdo_withdraw(cdo1)
-    M.mstro_cdo_withdraw(cdo2)
-
-    M.mstro_cdo_dispose(cdo1)
-    M.mstro_cdo_dispose(cdo2)
-    M.mstro_cdo_dispose(cdo2_copy)
-
-    M.mstro_finalize()
-
-
-test_local_pm()
-test_local_pm()
-
diff --git a/tests/coverage.c b/tests/coverage.c
index 5761b23703b4931a3cca371885ebb4143cdaeb43..a4c31f98a272557ea31d2d0ade976a7d0a7d4c09 100644
--- a/tests/coverage.c
+++ b/tests/coverage.c
@@ -84,19 +84,19 @@ CHEAT_TEST(invalid_cdo_declare, {
 	})
 
 CHEAT_TEST(invalid_cdo_seal, {
-	cheat_assert(MSTRO_INVARG==mstro_cdo_declaration_seal(NULL));
+	cheat_assert(MSTRO_UNINIT==mstro_cdo_declaration_seal(NULL));
 			})
 
 CHEAT_TEST(invalid_cdo_offer, {
-	cheat_assert(MSTRO_INVARG==mstro_cdo_offer(NULL));
+	cheat_assert(MSTRO_UNINIT==mstro_cdo_offer(NULL));
 })
 
 CHEAT_TEST(invalid_cdo_withdraw, {
-	cheat_assert(MSTRO_INVARG==mstro_cdo_withdraw(NULL));
+	cheat_assert(MSTRO_UNINIT==mstro_cdo_withdraw(NULL));
 })
 
 CHEAT_TEST(invalid_cdo_dispose, {
-	cheat_assert(MSTRO_INVARG==mstro_cdo_dispose(NULL));
+	cheat_assert(MSTRO_UNINIT==mstro_cdo_dispose(NULL));
 })
 
 CHEAT_TEST(math64,