Improved the daemon testing, including adding a test to ensure that