diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b37f7c0..dd0b6a5 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,5 +34,4 @@ jobs:
         tar xvzf checkexec-v0.2.0-x86_64-unknown-linux-musl.tar.gz checkexec
         chmod +x checkexec
         sudo mv checkexec /usr/local/bin
-    - run: just dummy_commercial
-    - run: cargo test
+    - run: just test
diff --git a/Justfile b/Justfile
index 4f6c7c5..4a4864e 100644
--- a/Justfile
+++ b/Justfile
@@ -97,10 +97,7 @@ generate:
 
 test *ARGS:
     checkexec commercial -- just dummy_commercial
-    cd core && cargo test -- "$@"
-    cd mir && cargo test
-    cd mir_rust && cargo test
-    cd libninja && cargo test -- "$@"
+    cargo test
 alias t := test
 
 integration *ARGS:
diff --git a/macro/src/lib.rs b/macro/src/lib.rs
index 30d482f..c13d55d 100644
--- a/macro/src/lib.rs
+++ b/macro/src/lib.rs
@@ -36,7 +36,7 @@ pub fn function(item: TokenStream) -> TokenStream {
         let Arg { name, arg_type, default } = arg;
         quote! {
             ::mir::FnArg2::Basic {
-                name: #name.into(),
+                name: ::mir::Ident::new(#name),
                 ty: #arg_type,
                 default: #default,
             }
@@ -83,7 +83,7 @@ pub fn rfunction(item: TokenStream) -> TokenStream {
         let Arg { name, arg_type, default } = arg;
         quote! {
             ::mir::FnArg2::Basic {
-                name: #name.into(),
+                name: ::mir::Ident::new(#name),
                 ty: #arg_type,
                 default: #default,
             }
diff --git a/macro/tests/function.rs b/macro/tests/function.rs
index 446196e..9a86e3e 100644
--- a/macro/tests/function.rs
+++ b/macro/tests/function.rs
@@ -8,7 +8,7 @@ fn test_function() {
     let s: Function<String> = function!(async main() {});
     assert_eq!(s.name.0, "main");
     assert_eq!(s.async_, true);
-    assert_eq!(s.vis, Visibility::Public);
+    assert_eq!(s.vis, Visibility::Private);
 }
 
 #[test]