Update Makefile to make tests pass