TYRUS-372: Revise Match class

	+ match tests refactored