Make all tests pass on emulator with SDK 8. Issue #272 fix attempt.