Fixed test to match new merge