Merge "assertTrue(mock.called) -> mock.assert_called"