Android Tests Updated