Fix diff output for wrong img dimensions; add test for diff