Add new test and fix Makefile