diff --git a/setup.py b/setup.py
index 34bfab90..0a355139 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,7 @@
     'flint.flintlib',
     'flint.flint_base',
     'flint.types',
+    'flint.functions',
     'flint.utils',
     'flint.test',
 ]
@@ -102,6 +103,8 @@
     ("flint.types.dirichlet", ["src/flint/types/dirichlet.pyx"]),
     ("flint.flint_base.flint_base", ["src/flint/flint_base/flint_base.pyx"]),
     ("flint.flint_base.flint_context", ["src/flint/flint_base/flint_context.pyx"]),
+    # Helper for unittests
+    ("flint.functions.showgood", ["src/flint/functions/showgood.pyx"]),
 
 ]
 
diff --git a/src/flint/__init__.py b/src/flint/__init__.py
index 68142e55..74b306a0 100644
--- a/src/flint/__init__.py
+++ b/src/flint/__init__.py
@@ -21,5 +21,6 @@
 from .types.acb_mat import *
 from .types.acb_series import *
 from .types.fmpz_mpoly import *
+from .functions.showgood import showgood
 
 __version__ = '0.4.4'
diff --git a/src/flint/functions/__init__.py b/src/flint/functions/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/flint/functions.pyx b/src/flint/functions/showgood.pyx
similarity index 97%
rename from src/flint/functions.pyx
rename to src/flint/functions/showgood.pyx
index 4512d5b7..bad6cabf 100644
--- a/src/flint/functions.pyx
+++ b/src/flint/functions/showgood.pyx
@@ -1,4 +1,5 @@
-from .utils.conversion cimport dps_to_prec
+from flint.flint_base.flint_context cimport thectx
+from flint.utils.conversion cimport dps_to_prec
 from flint.types.arb_mat cimport arb_mat
 from flint.types.acb_mat cimport acb_mat
 from flint.types.arb_poly cimport arb_poly
@@ -10,6 +11,7 @@ from flint.types.acb_series cimport acb_series
 from flint.flintlib.arb cimport *
 from flint.flintlib.acb cimport *
 
+ctx = thectx
 
 # xxx: this doesn't work when changed to a cdef function. why?
 def __goodness(x, bint parts=True, metric=None):
diff --git a/src/flint/pyflint.pyx b/src/flint/pyflint.pyx
index 02eea210..5c4770d1 100644
--- a/src/flint/pyflint.pyx
+++ b/src/flint/pyflint.pyx
@@ -12,5 +12,3 @@ cdef flint_rand_t global_random_state
 flint_randinit(global_random_state)
 
 ctx = thectx
-
-include "functions.pyx"