Move S3 fields together
Make testDuplicateFunctions more robust
Update README for server tarball