Improved AndroidTest