Fixed SnapshotTest
Merge commit 'ec95d24335a3ae60efcc42d37cbc6dcbd266f61c'