Fixing the tests and the import of the images.

#3802