Bugfix; macroresolving when $ARG1$ contains other macros
More unittests for parsing