Use Agg workarounds in image module as well
Update tests to more accurate results