Updated test setup