diff --git a/e2e/tests/dynamic/doc/wait/frame_navigation.fql b/e2e/tests/dynamic/doc/wait/frame_navigation.fqlx
similarity index 52%
rename from e2e/tests/dynamic/doc/wait/frame_navigation.fql
rename to e2e/tests/dynamic/doc/wait/frame_navigation.fqlx
index a83e1dd6..c392e857 100644
--- a/e2e/tests/dynamic/doc/wait/frame_navigation.fql
+++ b/e2e/tests/dynamic/doc/wait/frame_navigation.fqlx
@@ -1,13 +1,17 @@
 LET url = @lab.cdn.dynamic + "?redirect=/iframe&src=/iframe"
+// LET url = "http://192.168.4.23:8080/?redirect=/iframe&src=/iframe"
 LET page = DOCUMENT(url, { driver: 'cdp' })
-LET original = FIRST(FRAMES(page, "name", "nested"))
+LET original = FIRST(FRAMES(page, "url", "/\?redirect=/iframe$"))
 
 INPUT(original, "#url_input", "https://getbootstrap.com/")
+// WAIT(3000)
+
+// LET btn = ELEMENT(original, "#submit")
+// CLICK(btn)
+
 CLICK(original, "#submit")
 
-WAIT_NAVIGATION(page, {
-    frame: original
-})
+WAITFOR EVENT "navigation" IN page OPTIONS { frame: original } 10000
 
 LET current = FIRST(FRAMES(page, "name", "nested"))
 
diff --git a/pkg/drivers/cdp/utils/layout.go b/pkg/drivers/cdp/utils/layout.go
new file mode 100644
index 00000000..d4b585bf
--- /dev/null
+++ b/pkg/drivers/cdp/utils/layout.go
@@ -0,0 +1 @@
+package utils
diff --git a/pkg/runtime/logging/logger.go b/pkg/runtime/logging/logger.go
index ff7f299d..5e9c55c0 100644
--- a/pkg/runtime/logging/logger.go
+++ b/pkg/runtime/logging/logger.go
@@ -28,6 +28,20 @@ const (
 	Disabled
 )
 
+func ParseLevel(input string) (Level, error) {
+	lvl, err := zerolog.ParseLevel(input)
+
+	if err != nil {
+		return NoLevel, err
+	}
+
+	return Level(lvl), nil
+}
+
+func (l Level) String() string {
+	return zerolog.Level(l).String()
+}
+
 func WithContext(ctx context.Context, opts Options) context.Context {
 	c := zerolog.New(opts.Writer).With().Timestamp()
 
@@ -35,8 +49,7 @@ func WithContext(ctx context.Context, opts Options) context.Context {
 		c = c.Interface(k, v)
 	}
 
-	logger := c.Logger()
-	logger.Level(zerolog.Level(opts.Level))
+	logger := c.Logger().Level(zerolog.Level(opts.Level))
 
 	return logger.WithContext(ctx)
 }