Rework the tests layout.