Makefile & more tests