fixed unit tests
Merge branch 'release-3.3'
fixed uploader tests