merge updates to upload controller test