ANDROIDTUT-8: refactored variablenames; added test