Snapshots

One test failed but it's unrelated to these changes, so I think it was being flaky.