Modify watchdog test to use fsfix; #159, #164