Adding snapshot improvement test scenarios from ipclearance branch