Remove archive name variable, and fix up testing accordingly