Update makefile, before test merging