Merge pull request #739 from swt2c/makeSuite

Replace deprecated unittest.makeSuite