Enable snapshot_test in 2.1/trunk