Refactoring to use Client and Daemon intermittent tools

* Making empty unit test executable.