Restore before entering packrat mode
Tweak test package script a tiny bit