Wrap some more lines, and fix the image loading test on OS X.