update test/makefile and integrate test/nontest