Add uploader, tests pass