Merge pull request #1632 from jlipps/master

misc fixes
remove unused testfiles
add tests for apk downloading, delete old tests (fix #1631)