Fixing the Snapshot improvement tests and marvin framework to support concurrency