reaarrange tests
update to setup, install, tests
rearrange rd 2