fix up some of the makefiles, change the install directory of the tests