Adding mobile instance impl and applying changes to test