Add better testing for images