Restructure test setup.