Fixed some of the baselines, made file comparisons handle different
casing, put diagnostic message in correct order