complete test restructure