Add another cmd_macros test (broken) and fix portscan.r2