Sped up tests a little by reducing the number of archive calls