Small tests reorganization