Updated macro.pl and added test2.tx