by Dave Reid: Fixed remaining test failures and an error with getWatchdogMessages(). Now 100% test pass!