Fix snapshot tests
4 files changed