Fix a few deprecation warnings by switching to assertEqual