Reshape packaging of the tests