Replace assert_(a == b) with assertEqual(a, b) in some more places