Add new test setup