Refactoring in android tests