fixed our tests to work in android