Minor addition to test
Refactor Makefile