Structuring the build to renable the test suite.