Add more APK tests and fix some minor issues

Merged username-removed-26331 requested to merge grote/repomaker:more-tests into master