R6_US01_Integration code
Refactoring some code for integration of the code and update unit tests
Reviewer: Oscar Tapia