Also add a test for the Update() logic.
Reordered tunnels vs. storage initialization (prevent a nil ptr panic)