Modified test setup