Fix a couple things in Snapshot, added expect/parse tests for Snapshot.