Also fix a bugs found while adding the tests, oops. Signed-off-by: David Anderson <danderson@tailscale.com>
Signed-off-by: David Anderson <danderson@tailscale.com>