Improved image upload, test images and database