Reorganization of the tests