new version and add more test header files