Refactor score
Tests refactor