Fixed Android routine invocators + Minor re-factory + Unit tests