Add more unit tests for Matches