diff --git a/cmd/dagger/cmd/input/edit.go b/cmd/dagger/cmd/edit.go
similarity index 97%
rename from cmd/dagger/cmd/input/edit.go
rename to cmd/dagger/cmd/edit.go
index 61920fbe..3f899ec3 100644
--- a/cmd/dagger/cmd/input/edit.go
+++ b/cmd/dagger/cmd/edit.go
@@ -1,4 +1,4 @@
-package input
+package cmd
 
 import (
 	"context"
@@ -19,7 +19,7 @@ import (
 
 var editCmd = &cobra.Command{
 	Use:   "edit",
-	Short: "Interactively edit the inputs of an environment",
+	Short: "Interactively edit an environment",
 	Args:  cobra.MaximumNArgs(1),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		// Fix Viper bug for duplicate flags:
diff --git a/cmd/dagger/cmd/input/root.go b/cmd/dagger/cmd/input/root.go
index febb0690..ef1ae3cf 100644
--- a/cmd/dagger/cmd/input/root.go
+++ b/cmd/dagger/cmd/input/root.go
@@ -20,7 +20,6 @@ var Cmd = &cobra.Command{
 
 func init() {
 	Cmd.AddCommand(
-		editCmd,
 		dirCmd,
 		gitCmd,
 		containerCmd,
diff --git a/cmd/dagger/cmd/root.go b/cmd/dagger/cmd/root.go
index a4d0a061..254abd33 100644
--- a/cmd/dagger/cmd/root.go
+++ b/cmd/dagger/cmd/root.go
@@ -40,6 +40,7 @@ func init() {
 		queryCmd,
 		upCmd,
 		downCmd,
+		editCmd,
 		historyCmd,
 		loginCmd,
 		logoutCmd,
diff --git a/environment/environment_test.go b/environment/environment_test.go
index a2e10973..c811c569 100644
--- a/environment/environment_test.go
+++ b/environment/environment_test.go
@@ -10,7 +10,9 @@ import (
 func TestLocalDirs(t *testing.T) {
 	st := &state.State{
 		Path: "/tmp/source",
-		Plan: "/tmp/source/plan",
+		Plan: state.Plan{
+			Module: "/tmp/source/plan",
+		},
 	}
 	require.NoError(t, st.SetInput("www.source", state.DirInput("/", []string{}, []string{})))
 
diff --git a/state/workspace_test.go b/state/workspace_test.go
index 9b7b6afd..2073bd91 100644
--- a/state/workspace_test.go
+++ b/state/workspace_test.go
@@ -27,7 +27,7 @@ func TestWorkspace(t *testing.T) {
 	require.Equal(t, root, workspace.Path)
 
 	// Create
-	st, err := workspace.Create(ctx, "test")
+	st, err := workspace.Create(ctx, "test", "", "")
 	require.NoError(t, err)
 	require.Equal(t, "test", st.Name)
 
@@ -73,7 +73,7 @@ func TestEncryption(t *testing.T) {
 	workspace, err := Init(ctx, root)
 	require.NoError(t, err)
 
-	_, err = workspace.Create(ctx, "test")
+	_, err = workspace.Create(ctx, "test", "", "")
 	require.NoError(t, err)
 
 	// Set a plaintext input, make sure it is not encrypted