Adding unit tests of the engagement metrics
Refactoring metrics calculation
Refactoring metrics calculation