R6_US01_Integration code
Adding unit tests classes and fixes bugs