Update Makefile and config for test