Add overload calculate method and fix tests for score calc