Update testfile paths to new policy
Move code to compute diff images from test to new utility class