Fixed calculation of points
Added some basic tests and test data in data.yml