Fixed test and refined behaviour