fixed some failing test cases on android