Minor refactor and Fixed language and formatting.
Metric tests moved to separate file.  Tests no longer need links.
Refactored score related code.