Fix snapshot tests to not 'splode
Merge pull request #1057 from psav/fix_snapshot

Fix snapshot tests to not 'splode