Refactor makeSuite