Added unit tests for underlying criteria filter match