Update test makefiles and fix missing use