more test reorganization