CommDaemon and test code add