fix multiple upload bug
fix tests