Update Makefile for new daemon name
More tests