Added user points
Improved test
Improved test
Improved test