refactor default values.
added a dependency for daemon-test