Merge "Add daemon test"