rework the tests to use the new reorganization