Work in progress on unit tests & functionality tests for 'Add Metric'
Refactored all tests to utilise a GVL_CONST list