Added picture uploads and completed tests