Update test code to deal with the switch to storing archive