Reworks argument parsing, wip test updates