Refactor ARGV parser
Update ParsedArgv calls
Update tests