Redid regression tests to work with snapshots