Merge "Update CodeInspectionTest"