cleaned up some unused parts of the makefile
removed secondary expansion stuff from make/tests