Upgraded to Android 2.3.3 and Robolectric 2.2