Some reorganization in the tests