refactor of the setup into a setup in the suite