Restructure test suite