Improved test
Improved test