jUnit tests and the things which were wrong, TODO: watchdog is buggy