Test dependency toggling; little makefile fixes