Fixed test issues where remove acts differently between 2.4 and 2.6