Makefile and minor fixed in tst.