Persist more complex structure than shelf only
Safely execute thaw; don't use user's home directory for tests