Reworked framework to use the Android Testing framework