Does the built in Watchdog work

I'm not sure that a test on an ATmega328 would determine if the ATmega2560-based bootloader is fixed.

In fact, I believe that is the case. The Uno's bootloader is fixed while the MEGA-2560 bootloaders are not.