refactor on the test setup