Fixed tests that were failing on Android version 2.2