Re-add Makefile for tests