Specs cleanup
Use uuid_generator option for #store and #wrap