Fix matcher. Add integration test.