Fix warnings
fix tests for new upload spec