Merge pull request #474 from IAmNotHanni/master

Add new tests for advanced data uploading