diff --git a/src/DiagrammaticEquations.jl b/src/DiagrammaticEquations.jl
index c4d8ba9..50ad69d 100644
--- a/src/DiagrammaticEquations.jl
+++ b/src/DiagrammaticEquations.jl
@@ -30,7 +30,9 @@ to_graphviz, # Re-exported from Catlab
 ## rewrite
 average_rewrite,
 ## openoperators
-transfer_parents!, transfer_children!, replace_op1!, replace_op2!, replace_all_op1s!, replace_all_op2s!
+transfer_parents!, transfer_children!, replace_op1!, replace_op2!, replace_all_op1s!, replace_all_op2s!,
+Operator, same_type_rules_op, arthimetic_operators, infer_resolve!, type_check, DecaTypeExeception
+
 
 using Catlab.Theories
 import Catlab.Theories: otimes, oplus, compose, ⊗, ⊕, ⋅, associate, associate_unit, Ob, Hom, dom, codom
diff --git a/src/acset.jl b/src/acset.jl
index e576778..6dc33ac 100644
--- a/src/acset.jl
+++ b/src/acset.jl
@@ -8,9 +8,6 @@ using ACSets.InterTypes
 import Base.show
 
 using .decapodeacset
-# TODO: Move this export to main file
-export Operator, same_type_rules_op, arthimetic_operators, infer_resolve!, type_check
-export DecaTypeExeception
 
 # Transferring pointers
 # --------------------
diff --git a/test/language.jl b/test/language.jl
index 00b87b3..5a68b2d 100644
--- a/test/language.jl
+++ b/test/language.jl
@@ -7,7 +7,7 @@ using Base.Iterators
 using DiagrammaticEquations
 using DiagrammaticEquations.Deca
 
-import DiagrammaticEquations: Judgement
+import DiagrammaticEquations: Judgement, filterfor_ec_types
 
 @testset "Parsing" begin
   # Tests