change structure
rename tests