Added extensive tests for concrete matching