Add save/restore tests to upstream config
Add save/restore tests to upstream config