diff --git a/.gitignore b/.gitignore
index daf913b..4017d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ _testmain.go
 *.exe
 *.test
 *.prof
+gosh
diff --git a/shell/gosh.go b/gosh.go
similarity index 100%
rename from shell/gosh.go
rename to gosh.go
diff --git a/shell/gosh_test.go b/gosh_test.go
similarity index 85%
rename from shell/gosh_test.go
rename to gosh_test.go
index 188ee41..a19298d 100644
--- a/shell/gosh_test.go
+++ b/gosh_test.go
@@ -9,12 +9,12 @@ import (
 )
 
 var (
-	testPluginsDir = "../plugins"
+	testPluginsDir = "./plugins"
 )
 
 func TestShellNew(t *testing.T) {
 	shell := New()
-	if shell.pluginsDir != pluginsDir {
+	if shell.pluginsDir != testPluginsDir {
 		t.Error("pluginsDir not set")
 	}
 }
@@ -49,10 +49,10 @@ func TestShellHandle(t *testing.T) {
 
 	helloOut := bytes.NewBufferString("")
 	shell.ctx = context.WithValue(context.TODO(), "gosh.stdout", helloOut)
-	if err := shell.handle("testhello"); err == nil {
+	if _, err := shell.handle(shell.ctx, "testhello"); err == nil {
 		t.Error("this test should have failed with command not found")
 	}
-	if err := shell.handle("hello"); err != nil {
+	if _, err := shell.handle(shell.ctx, "hello"); err != nil {
 		t.Error(err)
 	}
 	printedOut := strings.TrimSpace(helloOut.String())
@@ -62,7 +62,7 @@ func TestShellHandle(t *testing.T) {
 
 	byeOut := bytes.NewBufferString("")
 	shell.ctx = context.WithValue(context.TODO(), "gosh.stdout", byeOut)
-	if err := shell.handle("goodbye"); err != nil {
+	if _, err := shell.handle(shell.ctx, "goodbye"); err != nil {
 		t.Error(err)
 	}
 	printedOut = strings.TrimSpace(byeOut.String())