Merge "Add test for replacing macro arguments" into main