use mach more data to test
add test
rename some types