Fix tests so image2 is resized and thumbnailed