Merge "Replace assertEqual(None, *) with assertIsNone in tests"