Fixed test based on Moncho's recommendations