Merge "Change assertTrue(isinstance()) by optimal assert"