Merge "Fix doctor test return check"