Completed switch from S3-based functions
Reintroduced uploads to flask client tests
cleanup