Some minor fixes (CalendarView)
Fixed a test to run in 4.0.3 (emulator)