merge testing activity, upgrade to Android Studio project