Add random matches logic + test