refactor up- and download tests, remove NullPointerException and lint error+warnings