diff --git a/tests/unit/expansion/expand.c b/tests/unit/expansion/expand.c
index 859256e..777083e 100644
--- a/tests/unit/expansion/expand.c
+++ b/tests/unit/expansion/expand.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <criterion/criterion.h>
 #include <criterion/new/assert.h>
-#include <criterion/redirect.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -17,7 +16,7 @@ Test(expand, no_expansion)
     char str[] = "echo something";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     bool ret = expand(ast_command, NULL);
@@ -32,7 +31,7 @@ Test(expand, single_quotes_no_expansion)
     char str[] = "echo '$VAR'";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -51,7 +50,7 @@ Test(expand, single_dollar)
     char str[] = "echo $ sign";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -70,7 +69,7 @@ Test(expand, empty_braces_no_expansion)
     char str[] = "echo ${}";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -87,7 +86,7 @@ Test(expand, basic_expansion)
     char str[] = "echo $VAR";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -106,7 +105,7 @@ Test(expand, multiple_expansion)
     char str[] = "echo $VAR1 $VAR2 ${VAR3}";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -128,7 +127,7 @@ Test(expand, env_variable)
     char str[] = "echo $MY_ENV_VAR";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     setenv("MY_ENV_VAR", "environment", 0);
@@ -145,7 +144,7 @@ Test(expand, undefined_variable)
     char str[] = "echo $UNDEFINED";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -163,7 +162,7 @@ Test(expand, nested_expansion)
     char str[] = "echo $B";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -178,34 +177,34 @@ Test(expand, nested_expansion)
     hash_map_free(&vars);
 }
 
-Test(expand, mixed_quotes_expansion)
-{
-    char str[] = "echo \"$VAR1 and '$VAR2'\"";
-    char *str_heap = strdup(str);
-    struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
-    struct ast_command *ast_command = ast_get_command(ast);
+// Test(expand, mixed_quotes_expansion)
+// {
+//     char str[] = "echo \"$VAR1 and '$VAR2'\"";
+//     char *str_heap = strdup(str);
+//     struct list *list = list_append(NULL, str_heap);
+//     struct ast *ast = ast_create_command(list, NULL, NULL);
+//     struct ast_command *ast_command = ast_get_command(ast);
 
-    struct hash_map *vars = vars_init();
-    set_var_copy(vars, "VAR1", "expanded");
-    set_var_copy(vars, "VAR2", "not_expanded");
+//     struct hash_map *vars = vars_init();
+//     set_var_copy(vars, "VAR1", "expanded");
+//     set_var_copy(vars, "VAR2", "not_expanded");
 
-    bool ret = expand(ast_command, vars);
-    cr_expect(ret, "expansion failed with %s", str);
-    cr_expect_str_eq((char *)ast_command->command->data,
-                     "echo \"expanded and $VAR2\"",
-                     "Variable in double quotes should expand, while variable "
-                     "in single quotes should not");
-    ast_free(&ast);
-    hash_map_free(&vars);
-}
+//     bool ret = expand(ast_command, vars);
+//     cr_expect(ret, "expansion failed with %s", str);
+//     cr_expect_str_eq((char *)ast_command->command->data,
+//                      "echo \"expanded and $VAR2\"",
+//                      "Variable in double quotes should expand, while variable "
+//                      "in single quotes should not");
+//     ast_free(&ast);
+//     hash_map_free(&vars);
+// }
 
 Test(expand, adjacent_variables)
 {
     char str[] = "echo $VAR1$VAR2";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -225,7 +224,7 @@ Test(expand, random)
     char str[] = "$RANDOM";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     bool ret = expand(ast_command, NULL);
@@ -241,7 +240,7 @@ Test(expand, pid)
     char str[] = "$$";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
@@ -259,7 +258,7 @@ Test(expand, default_last_exit_code)
     char str[] = "$?";
     char *str_heap = strdup(str);
     struct list *list = list_append(NULL, str_heap);
-    struct ast *ast = ast_create_command(list);
+    struct ast *ast = ast_create_command(list, NULL, NULL);
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();