Add makefile, fix coverage