Merge pull request #19 from praekelt/feature/issue-19-v1-metrics-usage

v1 Metrics - Usage
Merge branch 'develop' into feature/issue-27-v2-metrics-usage
improve test indentation