Finished matching service and tests