Cumlate users points and various rework.
Rework tests.