Update all to use snapshot, and update test to 1.6 as well.