Should 'test' be adjusted to match the argv._ values?