by Dave Reid: Updated watchdog test handling code and fixing test failure and obsolete hack now that #654752 is fixed.