Fixed test that exposes #2221