Improved ranking
Improved test