Merge: mnit_simple : Refactoring of android modules tests