Added tests, moved APKs