added some files
optimized test1
merge