TST: a few changes like self.assertTrue(x == y, message) -> assert_equal(x, y)
Merge pull request #4320 from argriffing/test-assertion-syntax

TST: a few changes like self.assertTrue(x == y, message) -> assert_equal(x, y)