5 files changed, 7 insertions, 10 deletions
diff --git a/spec/cell_spec.moon b/spec/cell_spec.moon
index 2b0860c..6ec9fc8 100644
--- a/spec/cell_spec.moon
+++ b/spec/cell_spec.moon
@@ -1,5 +1,4 @@
-import Cell, RootCell, Const  from require 'base'
-import Scope from require 'scope'
+import Cell, RootCell, Const, Scope from require 'core'
 import Registry from require 'registry'
 import Logger from require 'logger'
 Logger.init 'silent'
@@ -7,7 +6,6 @@ Logger.init 'silent'
 hello_world = Cell nil, { (Const.sym 'hello'), (Const.str 'world') }
 two_plus_two = Cell nil, { (Const.sym '+'), (Const.num 2), (Const.num 2) }
 
-
 describe 'Cell', ->
   describe 'quoting', ->
     it 'quotes children', ->
@@ -38,7 +36,8 @@ describe 'Cell', ->
       reg = mock register: =>
       root\quote nil, reg
 
-      (assert.spy reg.register).was.called_with reg, root, (Const.num 2)
+      (assert.spy reg.register).was.called!
+      (assert.spy reg.register).was.called_with reg, match._, Const.num 2
 
   describe 'evaluation', ->
     registry = Registry!
diff --git a/spec/const_spec.moon b/spec/const_spec.moon
index 4e4028f..4def3a6 100644
--- a/spec/const_spec.moon
+++ b/spec/const_spec.moon
@@ -1,5 +1,4 @@
-import Const, Op, Action from require 'base'
-import Scope from require 'scope'
+import Const, Op, Action, Scope from require 'core'
 import Logger from require 'logger'
 Logger.init 'silent'
 
diff --git a/spec/parsing_spec.moon b/spec/parsing_spec.moon
index 4bd5067..c405245 100644
--- a/spec/parsing_spec.moon
+++ b/spec/parsing_spec.moon
@@ -1,5 +1,5 @@
 import space, atom, expr, explist, cell, program, comment from require 'parsing'
-import Const from require 'base'
+import Const from require 'core'
 import Logger from require 'logger'
 Logger.init 'silent'
 
diff --git a/spec/registry_spec.moon b/spec/registry_spec.moon
index 53a406c..de79744 100644
--- a/spec/registry_spec.moon
+++ b/spec/registry_spec.moon
@@ -1,5 +1,5 @@
 import Registry from require 'registry'
-import Const from require 'base'
+import Const from require 'core'
 
 mk = ->
   mock destroy: =>
diff --git a/spec/scope_spec.moon b/spec/scope_spec.moon
index 97bc436..9e7ab80 100644
--- a/spec/scope_spec.moon
+++ b/spec/scope_spec.moon
@@ -1,5 +1,4 @@
-import Op, Const from require 'base'
-import Scope from require 'scope'
+import Scope, Const, Op from require 'core'
 import Logger from require 'logger'
 Logger.init 'silent'