refactor: moved setup/teardown items that were only used in one test