refactored suite setup, suite teardown and setup functions