Merge "Cleanup RefUpdateTest"