Made a few corrections to android test