Add scoring system to compute score of a given state
Update tests to reflect scoring system changes