New v2 ModuleArgsParser code and fixing up tests/other task code