Add 2 tests and improve the Makefile