XD-995: Use matcher and hence eventually()