Make snapshots for dependent cases

Change-Id: Iae703a5e196efad4d681bbb8030d1a9d246fa85b