diff --git a/src/CryoGrid.jl b/src/CryoGrid.jl
index 62a31e607aafe6f5b2d1f3f08daa8c4e427cd290..09ec21ed2ea074c0cf4091f3f114f38f9158d796 100755
--- a/src/CryoGrid.jl
+++ b/src/CryoGrid.jl
@@ -12,8 +12,6 @@ using Reexport
 # Common types and methods
 export Layer, SubSurface, Top, Bottom
 export Process, SubSurfaceProcess, BoundaryProcess, CoupledProcesses, Coupled
-export BoundaryStyle, Dirichlet, Neumann
-export Callback, CallbackStyle
 include("types.jl")
 export variables, initialcondition!, diagnosticstep!, prognosticstep!, interact!
 export boundaryflux, boundaryvalue, criterion, affect!, observe
diff --git a/test/Physics/HeatConduction/heat_conduction_tests.jl b/test/Physics/HeatConduction/heat_conduction_tests.jl
index 0f43bc3a9655f60bc043000dc9f52b92320dc2a7..f697daa9b68c9fe1b4900e2618d1c565f3273699 100644
--- a/test/Physics/HeatConduction/heat_conduction_tests.jl
+++ b/test/Physics/HeatConduction/heat_conduction_tests.jl
@@ -32,7 +32,7 @@ include("../../types.jl")
 		Δk = Δ(x)
 		sub = TestGroundLayer()
 		heat = Heat()
-		bc = ConstantBC(Dirichlet, 0.0u"°C")
+		bc = ConstantBC(CryoGrid.Dirichlet, 0.0u"°C")
 		@testset "top: +, bot: -" begin
 			T₀ = Vector(LinRange(-23,27,length(xc)))u"°C"
 			∂H = zeros(length(T₀))u"J/s/m^3"
@@ -62,7 +62,7 @@ include("../../types.jl")
 			@test ∂H[end] < 0.0u"J/s/m^3"
 		end
 		@testset "Neumann boundary" begin
-			bc = ConstantBC(Neumann, -1.0u"J/m^3")
+			bc = ConstantBC(CryoGrid.Neumann, -1.0u"J/m^3")
 			T₀ = Vector(LinRange(-23,27,length(xc)))u"°C"
 			∂H = zeros(length(T₀))u"J/s/m^3"
 			state = (T=T₀,k=k,dH=∂H,grids=(T=xc,k=x),t=0.0)
@@ -93,7 +93,7 @@ end
 	f_analytic(x,t) = exp(-t*4Ï€^2)*sin(2.0*Ï€*x)
 	sub = TestGroundLayer()
 	heat = Heat()
-	bc = ConstantBC(Dirichlet, 0.0u"°C")
+	bc = ConstantBC(CryoGrid.Dirichlet, 0.0u"°C")
 	function dTdt(T,p,t)
 		dT = similar(T)u"J/s/m^3"
 		dT .= zero(eltype(dT))