improved

Improvements to Match Test

Minor bug fixes and improvements to match test

Match Test
POC