Merge "Factor methods out to AbstractDaemonTest"