Merge "Use assertIs(Not)None to check for None"