Add missing Makefile
Merge branch 'fix-tests'