diff --git a/tests/func-test.el b/tests/func-test.el
index 82aa6fd..dd26f13 100644
--- a/tests/func-test.el
+++ b/tests/func-test.el
@@ -81,9 +81,9 @@ Make MAX-COUNT larger \(default 50) to wait longer before timeout."
     (eintest:wait-until (lambda () (ein:aand (ein:$notebook-kernel notebook)
                                              (ein:kernel-live-p it))))
     (with-current-buffer (ein:notebook-buffer notebook)
-      (ein:notebook-insert-cell-below-command)
+      (call-interactively #'ein:worksheet-insert-cell-below)
       (insert "a = 100\na")
-      (let ((cell (ein:notebook-execute-current-cell)))
+      (let ((cell (call-interactively #'ein:worksheet-execute-cell)))
         (eintest:wait-until (lambda () (not (oref cell :running)))))
       ;; (message "%s" (buffer-string))
       (save-excursion
@@ -95,10 +95,10 @@ Make MAX-COUNT larger \(default 50) to wait longer before timeout."
     (eintest:wait-until (lambda () (ein:aand (ein:$notebook-kernel notebook)
                                              (ein:kernel-live-p it))))
     (with-current-buffer (ein:notebook-buffer notebook)
-      (ein:notebook-insert-cell-below-command)
+      (call-interactively #'ein:worksheet-insert-cell-below)
       (insert (ein:join-str "\n" '("import pylab"
                                    "pylab.plot([1,2,3])")))
-      (let ((cell (ein:notebook-execute-current-cell)))
+      (let ((cell (call-interactively #'ein:worksheet-execute-cell)))
         (eintest:wait-until (lambda () (not (oref cell :running)))))
       (save-excursion
         (should (search-forward-regexp "Out \\[[0-9]+\\]" nil t))
@@ -110,9 +110,9 @@ Make MAX-COUNT larger \(default 50) to wait longer before timeout."
     (eintest:wait-until (lambda () (ein:aand (ein:$notebook-kernel notebook)
                                              (ein:kernel-live-p it))))
     (with-current-buffer (ein:notebook-buffer notebook)
-      (ein:notebook-insert-cell-below-command)
+      (call-interactively #'ein:worksheet-insert-cell-below)
       (insert "print 'Hello'")
-      (let ((cell (ein:notebook-execute-current-cell)))
+      (let ((cell (call-interactively #'ein:worksheet-execute-cell)))
         (eintest:wait-until (lambda () (not (oref cell :running)))))
       (save-excursion
         (should-not (search-forward-regexp "Out \\[[0-9]+\\]" nil t))
@@ -123,9 +123,9 @@ Make MAX-COUNT larger \(default 50) to wait longer before timeout."
     (eintest:wait-until (lambda () (ein:aand (ein:$notebook-kernel notebook)
                                              (ein:kernel-live-p it))))
     (with-current-buffer (ein:notebook-buffer notebook)
-      (ein:notebook-insert-cell-below-command)
+      (call-interactively #'ein:worksheet-insert-cell-below)
       (insert "range?")
-      (let ((cell (ein:notebook-execute-current-cell)))
+      (let ((cell (call-interactively #'ein:worksheet-execute-cell)))
         (eintest:wait-until (lambda () (not (oref cell :running)))))
       (with-current-buffer (get-buffer (ein:$notebook-pager ein:%notebook%))
         (should (search-forward "Docstring:\nrange"))))))
@@ -135,7 +135,7 @@ Make MAX-COUNT larger \(default 50) to wait longer before timeout."
     (eintest:wait-until (lambda () (ein:aand (ein:$notebook-kernel notebook)
                                              (ein:kernel-live-p it))))
     (with-current-buffer (ein:notebook-buffer notebook)
-      (ein:notebook-insert-cell-below-command)
+      (call-interactively #'ein:worksheet-insert-cell-below)
       (let ((pager-name (ein:$notebook-pager ein:%notebook%)))
         (ein:aif (get-buffer pager-name)
             (kill-buffer it))