Merge "Improved ExtendedMockitoTestCase to make it more error prone."