restructure test specs