Merge "Fix calls to mock.assert_not_called()"