diff --git a/tests/plan/hello-europa/main.cue b/tests/plan/hello-europa/main.cue
index b7ca0ac3..a30f5dac 100644
--- a/tests/plan/hello-europa/main.cue
+++ b/tests/plan/hello-europa/main.cue
@@ -2,15 +2,15 @@ package main
 
 import (
 	"dagger.io/dagger"
-	"alpha.dagger.io/os"
+	// "alpha.dagger.io/os"
 )
 
 dagger.#Plan & {
 	actions: {
-		sayHello: os.#Container & {
-			command: "echo Hello Europa! > /out.txt"
-		}
+		// sayHello: os.#Container & {
+		//  command: "echo Hello Europa! > /out.txt"
+		// }
 
-		verify: "Hello Europa!\n" & (os.#File & {from: sayHello, path: "/out.txt"}).contents
+		// verify: "Hello Europa!\n" & (os.#File & {from: sayHello, path: "/out.txt"}).contents
 	}
 }
diff --git a/tests/plan/proxy/incomplete_service.cue b/tests/plan/proxy/incomplete_service.cue
index 42be4e8b..70b9c037 100644
--- a/tests/plan/proxy/incomplete_service.cue
+++ b/tests/plan/proxy/incomplete_service.cue
@@ -2,26 +2,26 @@ package main
 
 import (
 	"dagger.io/dagger"
-
-	"alpha.dagger.io/dagger/op"
-	"alpha.dagger.io/alpine"
+	// "alpha.dagger.io/dagger/op"
+	// "alpha.dagger.io/alpine"
 )
 
 dagger.#Plan & {
 	// should fail due to incomplete service
 	proxy: dockerSocket: {}
 
-	actions: test: #up: [
-		op.#Load & {
-			from: alpine.#Image & {
-				package: "docker-cli": true
-			}
-		},
+	// TODO/FIXME: Use Europa constructs for this
+	// actions: test: #up: [
+	//  op.#Load & {
+	//   from: alpine.#Image & {
+	//    package: "docker-cli": true
+	//   }
+	//  },
 
-		op.#Exec & {
-			always: true
-			mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
-			args: ["docker", "info"]
-		},
-	]
+	//  op.#Exec & {
+	//   always: true
+	//   mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
+	//   args: ["docker", "info"]
+	//  },
+	// ]
 }
diff --git a/tests/plan/proxy/incomplete_unix.cue b/tests/plan/proxy/incomplete_unix.cue
index 39fca4e6..6bd26f4c 100644
--- a/tests/plan/proxy/incomplete_unix.cue
+++ b/tests/plan/proxy/incomplete_unix.cue
@@ -1,25 +1,27 @@
 package main
 
 import (
-	"alpha.dagger.io/dagger/op"
-	"alpha.dagger.io/alpine"
+	"dagger.io/dagger"
+	// "alpha.dagger.io/dagger/op"
+	// "alpha.dagger.io/alpine"
 )
 
 dagger.#Plan & {
 	// should fail because incomplete value
 	proxy: dockerSocket: unix: string
 
-	actions: test: #up: [
-		op.#Load & {
-			from: alpine.#Image & {
-				package: "docker-cli": true
-			}
-		},
+	// TODO/FIXME: Use Europa constructs for this
+	// actions: test: #up: [
+	//  op.#Load & {
+	//   from: alpine.#Image & {
+	//    package: "docker-cli": true
+	//   }
+	//  },
 
-		op.#Exec & {
-			always: true
-			mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
-			args: ["docker", "info"]
-		},
-	]
+	//  op.#Exec & {
+	//   always: true
+	//   mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
+	//   args: ["docker", "info"]
+	//  },
+	// ]
 }
diff --git a/tests/plan/proxy/invalid_schema.cue b/tests/plan/proxy/invalid_schema.cue
index 7f631aef..b49096c3 100644
--- a/tests/plan/proxy/invalid_schema.cue
+++ b/tests/plan/proxy/invalid_schema.cue
@@ -1,25 +1,27 @@
 package main
 
 import (
-	"alpha.dagger.io/dagger/op"
-	"alpha.dagger.io/alpine"
+	"dagger.io/dagger"
+	// "alpha.dagger.io/dagger/op"
+	// "alpha.dagger.io/alpine"
 )
 
 dagger.#Plan & {
 	// should fail because of misspelled key
 	proxy: dockerSocket: unx: "/var/run/docker.sock"
 
-	actions: test: #up: [
-		op.#Load & {
-			from: alpine.#Image & {
-				package: "docker-cli": true
-			}
-		},
+	// TODO/FIXME: Use Europa constructs for this
+	//  actions: test: #up: [
+	//   op.#Load & {
+	//    from: alpine.#Image & {
+	//     package: "docker-cli": true
+	//    }
+	//   },
 
-		op.#Exec & {
-			always: true
-			mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
-			args: ["docker", "info"]
-		},
-	]
+	//   op.#Exec & {
+	//    always: true
+	//    mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
+	//    args: ["docker", "info"]
+	//   },
+	//  ]
 }
diff --git a/tests/plan/proxy/invalid_value.cue b/tests/plan/proxy/invalid_value.cue
index 7383938e..f6897084 100644
--- a/tests/plan/proxy/invalid_value.cue
+++ b/tests/plan/proxy/invalid_value.cue
@@ -1,25 +1,27 @@
 package main
 
 import (
-	"alpha.dagger.io/dagger/op"
-	"alpha.dagger.io/alpine"
+	"dagger.io/dagger"
+	// "alpha.dagger.io/dagger/op"
+	// "alpha.dagger.io/alpine"
 )
 
 dagger.#Plan & {
 	// should fail because of misspelled value
 	proxy: dockerSocket: unix: "/var/run/docker.soc"
 
-	actions: test: #up: [
-		op.#Load & {
-			from: alpine.#Image & {
-				package: "docker-cli": true
-			}
-		},
+	// TODO/FIXME: Use Europa constructs for this
+	// actions: test: #up: [
+	//  op.#Load & {
+	//   from: alpine.#Image & {
+	//    package: "docker-cli": true
+	//   }
+	//  },
 
-		op.#Exec & {
-			always: true
-			mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
-			args: ["docker", "info"]
-		},
-	]
+	//  op.#Exec & {
+	//   always: true
+	//   mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
+	//   args: ["docker", "info"]
+	//  },
+	// ]
 }
diff --git a/tests/plan/proxy/unix.cue b/tests/plan/proxy/unix.cue
index 01c5b76d..0f69796a 100644
--- a/tests/plan/proxy/unix.cue
+++ b/tests/plan/proxy/unix.cue
@@ -2,25 +2,26 @@ package main
 
 import (
 	"dagger.io/dagger"
-	"alpha.dagger.io/dagger/op"
-	"alpha.dagger.io/alpine"
+	// "alpha.dagger.io/dagger/op"
+	// "alpha.dagger.io/alpine"
 )
 
 dagger.#Plan & {
 	// should succeed
 	proxy: dockerSocket: unix: "/var/run/docker.sock"
 
-	actions: test: #up: [
-		op.#Load & {
-			from: alpine.#Image & {
-				package: "docker-cli": true
-			}
-		},
+	// TODO/FIXME: Use Europa constructs for this
+	// actions: test: #up: [
+	//  op.#Load & {
+	//   from: alpine.#Image & {
+	//    package: "docker-cli": true
+	//   }
+	//  },
 
-		op.#Exec & {
-			always: true
-			mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
-			args: ["docker", "info"]
-		},
-	]
+	//  op.#Exec & {
+	//   always: true
+	//   mount: "/var/run/docker.sock": stream: proxy.dockerSocket.service
+	//   args: ["docker", "info"]
+	//  },
+	// ]
 }