restructure tests