refs #7310. Fix warnings. Fix test on windows.