Reorganize all the tests