Add match basic functionality + randomly generated mocks