SERVER-3820: fixed by matcher refactor
SERVER-4517: update test