added working files for android test bug fix