Added Dan's upload tests