add Makefile.am for test dir
improve