Fix integ test after class rename.

+review REVIEW-5034
Take 2 at windows line ending fixes.

+review REVIEW-5034