Tiny tests reorganization