Started TestMatch

Waiting for some code to contunie