Corrected verifications in snapshot tests.
Merge pull request #812 from aliceh/upstream-merge

Corrected verifications in snapshot tests.