test and makefile updates