Fixed test
Improved test