Refactoring the new metrics #216

Job	Run time
Coding Standard & Static Analysis	22s
Unittests (8.2)	24s
Unittests (8.3)	19s
Unittests (8.4)	26s
	1m 31s

Provide feedback