Better support for image path handling and tests