Made changes to allow testing images to be used