remove snapshot, make scripted test more flexible