tests

restructure