Extend unittest.TestCase
Merge branch 'master' into refactor/use-type-map