Makefile fixes due to failing tests