restructure tests
restructure tests