Unit test updates for Android 2.3