Update Makefile & add better testing