Make tests cover the new behavior