reorganization of the tests