Fix more test diff canonifiers that read files on cmdline

Fixed more test diff canonifiers due to an issue with btest-diff (these
changes should have been included in the previous commit).