fix e2e file upload test
Merged 'dev'.
update e2e-tests