Rework the tests