restructure test architecture