refactoring common resurces and adding setup and teardown to the suite