Image: safer tests