restructure
rename tests.