Added TestForMatch functionality
Merged conflict